From 077b44c43fd26c85d0cfceb67db15bfa34630b7b Mon Sep 17 00:00:00 2001 From: David Brooks Date: Wed, 16 Sep 2009 18:06:42 +0000 Subject: 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 --- main/pbx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'main/pbx.c') diff --git a/main/pbx.c b/main/pbx.c index c6e4c1bce..9b349da15 100644 --- 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; -- cgit v1.2.3