automerge commit

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 4f45d50fcac407a78df7f1f7258989584ff50251..37fd1746a09171fb5557eb0fff0c7c4d180a129f 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -12477,7 +12477,7 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, int
                                peer->expire = -1;
                                ast_clear_flag(&peer->flags_page2, SIP_PAGE2_DYNAMIC);  
                                if (!obproxyfound || !strcasecmp(v->name, "outboundproxy")) {
-                                       if (ast_get_ip_or_srv(&peer->addr, v->value, "_sip._udp")) {
+                                       if (ast_get_ip_or_srv(&peer->addr, v->value, srvlookup ? "_sip._udp" : NULL)) {
                                                ASTOBJ_UNREF(peer, sip_destroy_peer);
                                                return NULL;
                                        }
@@ -12765,7 +12765,7 @@ static int reload_config(void)
                } else if (!strcasecmp(v->name, "fromdomain")) {
                        ast_copy_string(default_fromdomain, v->value, sizeof(default_fromdomain));
                } else if (!strcasecmp(v->name, "outboundproxy")) {
-                       if (ast_get_ip_or_srv(&outboundproxyip, v->value, "_sip._udp") < 0)
+                       if (ast_get_ip_or_srv(&outboundproxyip, v->value, srvlookup ? "_sip._udp" : NULL) < 0)
                                ast_log(LOG_WARNING, "Unable to locate host '%s'\n", v->value);
                } else if (!strcasecmp(v->name, "outboundproxyport")) {
                        /* Port needs to be after IP */