[svn-commits] russell: branch 1.6.0 r115520 - in /branches/1.6.0: ./ channels/chan_h323.c

[SVN commits to the Digium repositories]

Author: russell
Date: Wed May  7 13:25:08 2008
New Revision: 115520

URL: http://svn.digium.com/view/asterisk?view=rev&rev=115520
Log:
Merged revisions 115519 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r115519 | russell | 2008-05-07 13:24:51 -0500 (Wed, 07 May 2008) | 2 lines

Let chan_h323 build in dev mode

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_h323.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_h323.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_h323.c?view=diff&rev=115520&r1=115519&r2=115520
==============================================================================
--- branches/1.6.0/channels/chan_h323.c (original)
+++ branches/1.6.0/channels/chan_h323.c Wed May  7 13:25:08 2008
@@ -1551,11 +1551,11 @@
 	struct oh323_peer *peer;
 	struct ast_variable *var;
 	struct ast_variable *tmp;
-	const char *addr;
+	const char *addr = NULL;
 
 	/* First check on peer name */
 	if (peername)
-		var = ast_load_realtime("h323", "name", peername, addr = NULL);
+		var = ast_load_realtime("h323", "name", peername, NULL);
 	else if (sin) /* Then check on IP address for dynamic peers */
 		var = ast_load_realtime("h323", "host", addr = ast_inet_ntoa(sin->sin_addr), NULL);
 	else