Merged revisions 309256 via svnmerge from
authorJason Parker <jparker@digium.com>
Wed, 2 Mar 2011 19:54:43 +0000 (19:54 +0000)
committerJason Parker <jparker@digium.com>
Wed, 2 Mar 2011 19:54:43 +0000 (19:54 +0000)
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

channels/chan_sip.c

index 5a271ee..86c94bb 100644 (file)
@@ -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;
                        }
                }