diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-06 18:43:24 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-06 18:43:24 +0000 |
| commit | c0becafa2d07e09addd2a7a21b1bdef5eaf32fa9 (patch) | |
| tree | 96ec12aec6907653229a51de6376ec52a13cdba7 /channels | |
| parent | 67f8bc2636f26fd9076a80c73f92bc6d760f5674 (diff) | |
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: http://svn.digium.com/svn/asterisk/branches/1.6.2@228551 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -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 d029eaf98..0c5add6c8 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")) { |