diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-06 18:41:59 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-06 18:41:59 +0000 |
| commit | e6601ae23271f6ba68089de63baef589851c2307 (patch) | |
| tree | 17aa50446def0d5577940233c5e8668f3eda5c09 | |
| parent | cd08e61cd04aea0dc260a31270c4a8d8b4638e38 (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.1@228550 f38db490-d61c-443f-a65b-d21fe96a405b
| -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 89699d4ea..0ea34dac3 100644 --- a/channels/chan_sip.c +++ b/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")) { |