diff options
| author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-14 16:57:08 +0000 |
|---|---|---|
| committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2010-01-14 16:57:08 +0000 |
| commit | d95f0c84e3d9519d14feb024cd46acccc0068825 (patch) | |
| tree | da4df4886ebee76a959c6db1d69f1305be31796c /main | |
| parent | 46f14f75c75c958c334540fb67ecda4e879e2887 (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.2@240132 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 3b31c301f..861311a3d 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -3938,7 +3938,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] == '_') { |