kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2026-07-28 00:10:25 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 228547 via svnmerge from

Browse Source 
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
This commit is contained in:
Joshua Colp
2009-11-06 18:37:59 +00:00
parent 7c4fd85293
commit c205958f4c
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channels/chan_sip.c
+3
View File
@@ -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")) {