[svn-commits] file: trunk r70553 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: file
Date: Wed Jun 20 17:24:47 2007
New Revision: 70553

URL: http://svn.digium.com/view/asterisk?view=rev&rev=70553
Log:
Merged revisions 70552 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r70552 | file | 2007-06-20 18:22:20 -0400 (Wed, 20 Jun 2007) | 10 lines

Merged revisions 70551 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r70551 | file | 2007-06-20 18:20:16 -0400 (Wed, 20 Jun 2007) | 2 lines

Don't overwrite the configured username setting upon a REGISTER. (issue #8565 reported by jsmith)

........

................

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_sip.c?view=diff&rev=70553&r1=70552&r2=70553
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Wed Jun 20 17:24:47 2007
@@ -8456,10 +8456,8 @@
 	/* Save SIP options profile */
 	peer->sipoptions = pvt->sipoptions;
 
-	if (!ast_strlen_zero(curi))	/* Overwrite the default username from config at registration */
+	if (!ast_strlen_zero(curi) && ast_strlen_zero(peer->username))
 		ast_copy_string(peer->username, curi, sizeof(peer->username));
-	else
-		peer->username[0] = '\0';
 
 	if (peer->expire > -1) {
 		ast_sched_del(sched, peer->expire);