From 2a261612cd0614a55b38d92cf198860cdc2522d4 Mon Sep 17 00:00:00 2001 From: Tilghman Lesher Date: Thu, 14 Jan 2010 16:56:29 +0000 Subject: [PATCH] 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 --- main/pbx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/pbx.c b/main/pbx.c index 7d04c62038..e87d7d0c9a 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] == '_') { -- 2.47.2