From: Joshua Colp <jcolp@digium.com>
Date: Wed, 20 Jun 2007 22:24:47 +0000 (+0000)
Subject: Merged revisions 70552 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2311
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18f492022737fa604644a6a4b43704331d92eb82;p=thirdparty%2Fasterisk.git

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)

........

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


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 8277285140..06f5943fa0 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -8456,10 +8456,8 @@ static enum parse_register_result parse_register_contact(struct sip_pvt *pvt, st
 	/* 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);