[asterisk-commits] russell: trunk r46562 - in /trunk: ./ main/utils.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Tue Oct 31 00:21:40 2006
New Revision: 46562

URL: http://svn.digium.com/view/asterisk?rev=46562&view=rev
Log:
Merged revisions 46561 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r46561 | russell | 2006-10-31 01:19:56 -0500 (Tue, 31 Oct 2006) | 11 lines

Merged revisions 46560 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r46560 | russell | 2006-10-31 01:18:36 -0500 (Tue, 31 Oct 2006) | 3 lines

When handling the case where the hostname is just an IPV4 numeric address,
be sure to set the address type.  (issue #8247, alexr)

........

................

Modified:
    trunk/   (props changed)
    trunk/main/utils.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/utils.c
URL: http://svn.digium.com/view/asterisk/trunk/main/utils.c?rev=46562&r1=46561&r2=46562&view=diff
==============================================================================
--- trunk/main/utils.c (original)
+++ trunk/main/utils.c Tue Oct 31 00:21:40 2006
@@ -204,6 +204,7 @@
 		if (dots != 3)
 			return NULL;
 		memset(hp, 0, sizeof(struct ast_hostent));
+		hp->hp.h_addrtype = AF_INET;
 		hp->hp.h_addr_list = (void *) hp->buf;
 		hp->hp.h_addr = hp->buf + sizeof(void *);
 		if (inet_pton(AF_INET, host, hp->hp.h_addr) > 0)