From: Joshua Colp <jcolp@digium.com>
Date: Fri, 6 Nov 2009 18:40:18 +0000 (+0000)
Subject: Merged revisions 228548 via svnmerge from
X-Git-Tag: 1.6.0.18-rc2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=308a723c9129a0ea60e1d92221f96d6faf3351c3;p=thirdparty%2Fasterisk.git

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.0@228549 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 89d5025595..3e67752beb 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -21309,6 +21309,9 @@ static struct sip_user *build_user(const char *name, struct ast_variable *v, str
 			ast_callerid_split(v->value, user->cid_name, sizeof(user->cid_name), user->cid_num, sizeof(user->cid_num));
 		} else if (!strcasecmp(v->name, "fullname")) {
 			ast_copy_string(user->cid_name, v->value, sizeof(user->cid_name));
+		} else if (!strcasecmp(v->name, "trunkname")) {
+			/* This is actually for a trunk, so we don't want to override callerid */
+			ast_copy_string(user->cid_name, "", sizeof(user->cid_name));
 		} else if (!strcasecmp(v->name, "cid_number")) {
 			ast_copy_string(user->cid_num, v->value, sizeof(user->cid_num));
 		} else if (!strcasecmp(v->name, "callgroup")) {
@@ -21610,6 +21613,9 @@ static struct sip_peer *build_peer(const char *name, struct ast_variable *v, str
 				ast_callerid_split(v->value, peer->cid_name, sizeof(peer->cid_name), peer->cid_num, sizeof(peer->cid_num));
 			} else if (!strcasecmp(v->name, "fullname")) {
 				ast_copy_string(peer->cid_name, v->value, sizeof(peer->cid_name));
+			} else if (!strcasecmp(v->name, "trunkname")) {
+				/* This is actually for a trunk, so we don't want to override callerid */
+				ast_copy_string(peer->cid_name, "", sizeof(peer->cid_name));
 			} else if (!strcasecmp(v->name, "cid_number")) {
 				ast_copy_string(peer->cid_num, v->value, sizeof(peer->cid_num));
 			} else if (!strcasecmp(v->name, "context")) {