Merged revisions 158600 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r158600 | tilghman | 2008-11-21 17:07:46 -0600 (Fri, 21 Nov 2008) | 5 lines

  The passed extension may not be the same in the list as the current entry,
  because we strip spaces when copying the extension into the structure.
  Therefore, use the copied item to place the item into the list.
  (found by lmadsen on -dev, fixed by me)
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@158602 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/pbx.c b/main/pbx.c
index 7c308121d854032678b83a54bd5d25e481eb3b37..2621aa1fddea2b6fbcc2d1775f4524449e3349a4 100644 (file)
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -7523,7 +7523,7 @@ int ast_add_extension2(struct ast_context *con,
        }
        res = 0; /* some compilers will think it is uninitialized otherwise */
        for (e = con->root; e; el = e, e = e->next) {   /* scan the extension list */
-               res = ext_cmp(e->exten, extension);
+               res = ext_cmp(e->exten, tmp->exten);
                if (res == 0) { /* extension match, now look at cidmatch */
                        if (!e->matchcid && !tmp->matchcid)
                                res = 0;