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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@240131 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/pbx.c b/main/pbx.c
index 7d04c620387c9215be86ab939e4afe26ffcb3548..e87d7d0c9a72bd10e8268b90c3028f2ff9ffa2fc 100644 (file)
--- 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] == '_') {