diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-14 16:56:29 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-14 16:56:29 +0000 |
| commit | cc20956ba94cb4778e579a7e0bb5c720c07e9ee9 (patch) | |
| tree | 577030de3c7ce6f64e25aa55fef3209ca171a9bc /main | |
| parent | 6fb75d5055e9e11f45720693690ead12a5d3791f (diff) | |
Merged revisions 240129 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r240129 | tilghman | 2010-01-14 10:52:22 -0600 (Thu, 14 Jan 2010) | 4 lines
Ensure that the callerid is NULL when the parent is effectively NULL.
This applies only to pattern-match hints, which create exact-match
hints on the fly.
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@240131 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
| -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 7d04c6203..e87d7d0c9 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -3446,7 +3446,7 @@ int ast_extension_state_add(const char *context, const char *exten, */ if (e->exten[0] == '_') { ast_add_extension(e->parent->name, 0, exten, e->priority, e->label, - e->cidmatch, e->app, ast_strdup(e->data), ast_free_ptr, + e->matchcid ? e->cidmatch : NULL, e->app, ast_strdup(e->data), ast_free_ptr, e->registrar); e = ast_hint_extension(NULL, context, exten); if (!e || e->exten[0] == '_') { |