diff options
| author | dbrooks <dbrooks@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-16 19:40:46 +0000 |
|---|---|---|
| committer | dbrooks <dbrooks@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-09-16 19:40:46 +0000 |
| commit | 807a65cd3017e02e78a45683828ba35371e0c7b2 (patch) | |
| tree | 462ee2cf57c5f1778fc11ff51ddfabe513607375 | |
| parent | 0847802336a1bc4eef66ec91843026197d81b611 (diff) | |
Merged revisions 218868 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r218868 | dbrooks | 2009-09-16 13:06:42 -0500 (Wed, 16 Sep 2009) | 20 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@218938 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | main/pbx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/pbx.c b/main/pbx.c index 4ada0f4bf..3b67216fa 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -7712,7 +7712,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; |