diff options
| author | Joshua Colp <jcolp@digium.com> | 2009-11-06 18:37:59 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2009-11-06 18:37:59 +0000 |
| commit | c205958f4c028192f10947236e116cf001469eb3 (patch) | |
| tree | 0ad95837bc46546b0d80f58469b54911d97fd3ac /channels/chan_sip.c | |
| parent | 7c4fd85293ca618e3b5701913b59bb66282a8633 (diff) | |
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
Diffstat (limited to 'channels/chan_sip.c')
| -rw-r--r-- | channels/chan_sip.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index a7141b6e1..6850f833b 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")) { |