From: Jason Parker Date: Wed, 2 Mar 2011 19:53:47 +0000 (+0000) Subject: Fix usage of "hasvoicemail=yes" and "mailbox=" in users.conf for SIP. X-Git-Tag: 1.6.2.19-rc1~3^2~98 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a31990174b1c88767bfaa8b022f9ef119f8d4252;p=thirdparty%2Fasterisk.git Fix usage of "hasvoicemail=yes" and "mailbox=" in users.conf for SIP. Since it's a duplicate, nothing is going to be done, so delme doesn't need to be set at all. Strangely, when this was added, this was being set to 1 in 1.6, and 0 in trunk. (issue AST-439) git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.2@309255 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/channels/chan_sip.c b/channels/chan_sip.c index af6d3fbb5d..19039c68eb 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -24236,7 +24236,6 @@ static void add_peer_mailboxes(struct sip_peer *peer, const char *value) AST_LIST_TRAVERSE(&peer->mailboxes, mailbox, entry) { if (!strcmp(mailbox->mailbox, mbox) && !strcmp(S_OR(mailbox->context, ""), S_OR(context, ""))) { duplicate = 1; - mailbox->delme = 1; break; } }