automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@70609 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge Script
2007-06-20 23:26:55 +00:00
parent a65fcc6950
commit 4a623ce514
+1 -3
View File
@@ -6231,10 +6231,8 @@ static enum parse_register_result parse_register_contact(struct sip_pvt *pvt, st
memcpy(&p->addr, &pvt->recv, sizeof(p->addr));
}
if (c) /* Overwrite the default username from config at registration */
if (c && ast_strlen_zero(p->username))
ast_copy_string(p->username, c, sizeof(p->username));
else
p->username[0] = '\0';
if (p->expire > -1) {
ast_sched_del(sched, p->expire);