automerge commit

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

diff --git a/res/res_agi.c b/res/res_agi.c
index 56ab7bf42288b1cc638e29d477d69fdb96349ecc..022cee46ea2570d3726e8c9d086aec370210eb7a 100644 (file)
--- a/res/res_agi.c
+++ b/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 = "*";

diff --git a/utils.c b/utils.c
index 8f3dbcd7b32ea02e1b4173a862f42b0c4dd52b00..e712ebe665cc9f30d44b02237951c0dea82546aa 100644 (file)
--- a/utils.c
+++ b/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)