From c205958f4c028192f10947236e116cf001469eb3 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Fri, 6 Nov 2009 18:37:59 +0000 Subject: [PATCH] Merged revisions 228547 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r228547 | file | 2009-11-06 14:32:58 -0400 (Fri, 06 Nov 2009) | 4 lines Don't overwrite caller ID name on a trunk with the configured fullname when using users.conf (issue ABE-1989) ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@228548 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/chan_sip.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/channels/chan_sip.c b/channels/chan_sip.c index a7141b6e1e..6850f833b2 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -24850,6 +24850,9 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, str ast_string_field_set(peer, mwi_from, v->value); } else if (!strcasecmp(v->name, "fullname")) { ast_string_field_set(peer, cid_name, v->value); + } else if (!strcasecmp(v->name, "trunkname")) { + /* This is actually for a trunk, so we don't want to override callerid */ + ast_string_field_set(peer, cid_name, ""); } else if (!strcasecmp(v->name, "cid_number")) { ast_string_field_set(peer, cid_num, v->value); } else if (!strcasecmp(v->name, "context")) {