Similarly, ensure that matchcid is duplicated correctly when merging contexts.
authorTilghman Lesher <tilghman@meg.abyt.es>
Thu, 14 Jan 2010 17:34:53 +0000 (17:34 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Thu, 14 Jan 2010 17:34:53 +0000 (17:34 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@240175 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/pbx.c

index d0de1b2..b9ba3fb 100644 (file)
@@ -6921,7 +6921,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);