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

channels/chan_sip.c

@@ -22717,6 +22717,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")) {