automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@46581 65c4cc65-6c06-0410-ace0-fbb531ad65f3

res/res_agi.c

@@ -507,12 +507,12 @@ static int handle_controlstreamfile(struct ast_channel *chan, AGI *agi, int argc
 	if ((argc > 5) && (sscanf(argv[5], "%d", &skipms) != 1))
 		return RESULT_SHOWUSAGE;
 
-	if (argc > 6 && !ast_strlen_zero(argv[8]))
+	if (argc > 6 && !ast_strlen_zero(argv[6]))
 		fwd = argv[6];
 	else
 		fwd = "#";
 
-	if (argc > 7 && !ast_strlen_zero(argv[8]))
+	if (argc > 7 && !ast_strlen_zero(argv[7]))
 		rev = argv[7];
 	else
 		rev = "*";

utils.c

@@ -195,6 +195,7 @@ struct hostent *ast_gethostbyname(const char *host, struct ast_hostent *hp)
 		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)