diff options
| author | Jason Parker <jparker@digium.com> | 2011-03-02 19:54:43 +0000 |
|---|---|---|
| committer | Jason Parker <jparker@digium.com> | 2011-03-02 19:54:43 +0000 |
| commit | 070cb4ef871c40acc3f71a2a0415e0c381e1307d (patch) | |
| tree | 0bd3a58043dbd092b37f03d53ffacb735178e2cb /channels | |
| parent | dc616cfe2cc0e7449b0462da17ce7ccaee344fd8 (diff) | |
Merged revisions 309256 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8
................
r309256 | qwell | 2011-03-02 13:54:20 -0600 (Wed, 02 Mar 2011) | 15 lines
Merged revisions 309255 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.6.2
........
r309255 | qwell | 2011-03-02 13:53:47 -0600 (Wed, 02 Mar 2011) | 8 lines
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/trunk@309257 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 5a271eea4..86c94bb26 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -26154,7 +26154,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 = 0; break; } } |