Merged revisions 218867 via svnmerge from

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

........
  r218867 | dbrooks | 2009-09-16 13:00:45 -0500 (Wed, 16 Sep 2009) | 13 lines

  Fixes CID pattern matching behavior to mirror that of extension pattern matching.

  Pattern matching for extensions uses a type of scoring system, giving values for
  specificity to each character in the pattern. Unfortunately, this is done character
  by character, in order. This does lead to some less specific patterns being first
  in line for matching, but it will usually get the job done.

  This patch merely brings CID matching to the same level as extension matching.
  This patch does not attempt to tackle the problem shared by extension matching.

  (closes issue #14708)
  Reported by: klaus3000
........

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

diff --git a/main/pbx.c b/main/pbx.c
index c6e4c1bcea0c978cc55ae431e80cd8eb22afa294..9b349da15c0db7827f40ae28777c3c658dee1682 100644 (file)
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -8025,7 +8025,7 @@ static int ast_add_extension2_lockopt(struct ast_context *con,
                        else if (e->matchcid && !tmp->matchcid)
                                res = -1;
                        else
-                               res = strcasecmp(e->cidmatch, tmp->cidmatch);
+                               res = ext_cmp(e->cidmatch, tmp->cidmatch);
                }
                if (res >= 0)
                        break;