diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-06 18:40:18 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-11-06 18:40:18 +0000 |
| commit | 9601ec146fe6ca953aa26939e383ab5e5d24b1b2 (patch) | |
| tree | a36ac8b974f9a249048a81db086639407349c39b /channels | |
| parent | 3184d35cb9576c6e9d01fc8096d29a689d68ae10 (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.0@228549 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels')
| -rw-r--r-- | channels/chan_sip.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/channels/chan_sip.c b/channels/chan_sip.c index 89d502559..3e67752be 100644 --- a/channels/chan_sip.c +++ b/channels/chan_sip.c @@ -21309,6 +21309,9 @@ static struct sip_user *build_user(const char *name, struct ast_variable *v, str ast_callerid_split(v->value, user->cid_name, sizeof(user->cid_name), user->cid_num, sizeof(user->cid_num)); } else if (!strcasecmp(v->name, "fullname")) { ast_copy_string(user->cid_name, v->value, sizeof(user->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(user->cid_name, "", sizeof(user->cid_name)); } else if (!strcasecmp(v->name, "cid_number")) { ast_copy_string(user->cid_num, v->value, sizeof(user->cid_num)); } else if (!strcasecmp(v->name, "callgroup")) { @@ -21610,6 +21613,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")) { |