From 6a421cccfa1f93aceb134fa552e600434fe4a8fe Mon Sep 17 00:00:00 2001
From: Joshua Colp <jcolp@digium.com>
Date: Fri, 6 Nov 2009 18:43:24 +0000
Subject: [PATCH] Merged revisions 228548 via svnmerge from
 https://origsvn.digium.com/svn/asterisk/trunk

................
  r228548 | file | 2009-11-06 14:37:59 -0400 (Fri, 06 Nov 2009) | 11 lines

  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/branches/1.6.2@228551 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 d029eaf98e..0c5add6c83 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -23692,6 +23692,9 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, str
 				ast_string_field_set(peer, cid_num, cid_num);
 			} 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")) {