Merged revisions 132468 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
r132468 | bbryant | 2008-07-21 12:42:45 -0500 (Mon, 21 Jul 2008) | 5 lines

Fix bug where ast_parse_arg would inadvertantly enable sip tcp when parsing a tcpbindaddr if it was disabled.

(closes issue #13117)
Reported by: pj

........


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

channels/chan_sip.c

@@ -20537,8 +20537,10 @@ static int reload_config(enum channelreloadreason reason)
 			sip_tcp_desc.sin.sin_family = ast_false(v->value) ? 0 : AF_INET;
 			ast_debug(2, "Enabling TCP socket for listening\n");
 		} else if (!strcasecmp(v->name, "tcpbindaddr")) {
+			int family = sip_tcp_desc.sin.sin_family;
 			if (ast_parse_arg(v->value, PARSE_INADDR, &sip_tcp_desc.sin))
 				ast_log(LOG_WARNING, "Invalid %s '%s' at line %d of %s\n", v->name, v->value, v->lineno, config);
+			sip_tcp_desc.sin.sin_family = family;
 			ast_debug(2, "Setting TCP socket address to %s\n", v->value);
 		} else if (!strcasecmp(v->name, "tlsenable")) {
 			default_tls_cfg.enabled = ast_true(v->value) ? TRUE : FALSE;