From: Tilghman Lesher Date: Thu, 14 Jan 2010 17:39:37 +0000 (+0000) Subject: Merged revisions 240175 via svnmerge from X-Git-Tag: 1.6.1.15-rc1~52 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e51a0acddc65ff8bbfd4a896e87f39166beb4d76;p=thirdparty%2Fasterisk.git Merged revisions 240175 via svnmerge from https://origsvn.digium.com/svn/asterisk/trunk ........ r240175 | tilghman | 2010-01-14 11:34:53 -0600 (Thu, 14 Jan 2010) | 2 lines Similarly, ensure that matchcid is duplicated correctly when merging contexts. ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@240177 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/main/pbx.c b/main/pbx.c index e87d7d0c9a..38af4deeee 100644 --- a/main/pbx.c +++ b/main/pbx.c @@ -6040,7 +6040,7 @@ static void context_merge(struct ast_context **extcontexts, struct ast_hashtab * dupdstr = ast_strdup(prio_item->data); res1 = ast_add_extension2(new, 0, prio_item->exten, prio_item->priority, prio_item->label, - prio_item->cidmatch, prio_item->app, dupdstr, prio_item->datad, prio_item->registrar); + prio_item->matchcid ? prio_item->cidmatch : NULL, prio_item->app, dupdstr, prio_item->datad, prio_item->registrar); if (!res1 && new_exten_item && new_prio_item){ ast_verb(3,"Dropping old dialplan item %s/%s/%d [%s(%s)] (registrar=%s) due to conflict with new dialplan\n", context->name, prio_item->exten, prio_item->priority, prio_item->app, (char*)prio_item->data, prio_item->registrar);