aboutsummaryrefslogtreecommitdiffstats
path: root/channels
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2007-06-20 22:22:20 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2007-06-20 22:22:20 +0000
commitd40c1d823df09e242097e76f27a98f03f62738b5 (patch)
tree6f5c1e437ddf2412b10782691fe998d4521a9a00 /channels
parentfd8261af4548988e9bd69df93e3cb6692a8bfab6 (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.4@70552 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
-rw-r--r--channels/chan_sip.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index d6f513a64..85086d044 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -7922,10 +7922,8 @@ static enum parse_register_result parse_register_contact(struct sip_pvt *pvt, st
/* Save SIP options profile */
peer->sipoptions = pvt->sipoptions;
- if (curi) /* Overwrite the default username from config at registration */
+ if (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);