[svn-commits] file: trunk r228548 - in /trunk: ./ channels/chan_sip.c

[SVN commits to the Digium repositories]

Author: file
Date: Fri Nov  6 12:37:59 2009
New Revision: 228548

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=228548
Log:
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)
........

Modified:
    trunk/   (props changed)
    trunk/channels/chan_sip.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/trunk/channels/chan_sip.c?view=diff&rev=228548&r1=228547&r2=228548
==============================================================================
--- trunk/channels/chan_sip.c (original)
+++ trunk/channels/chan_sip.c Fri Nov  6 12:37:59 2009
@@ -24850,6 +24850,9 @@
 				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")) {