[asterisk-commits] file: branch 1.6.1 r227169 - in /branches/1.6.1: ./ channels/chan_sip.c

[SVN commits to the Asterisk project]

Author: file
Date: Tue Nov  3 09:38:57 2009
New Revision: 227169

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=227169
Log:
Merged revisions 227167 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

................
  r227167 | file | 2009-11-03 11:37:08 -0400 (Tue, 03 Nov 2009) | 12 lines
  
  Merged revisions 227166 via svnmerge from 
  https://origsvn.digium.com/svn/asterisk/branches/1.4
  
  ........
    r227166 | file | 2009-11-03 11:36:16 -0400 (Tue, 03 Nov 2009) | 5 lines
    
    Fix a bug where an RPID header could be generated with a blank username in the URI.
    
    (closes issue #15909)
    Reported by: kobaz
  ........
................

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/channels/chan_sip.c

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/channels/chan_sip.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.1/channels/chan_sip.c?view=diff&rev=227169&r1=227168&r2=227169
==============================================================================
--- branches/1.6.1/channels/chan_sip.c (original)
+++ branches/1.6.1/channels/chan_sip.c Tue Nov  3 09:38:57 2009
@@ -9752,7 +9752,7 @@
 	if (!ast_strlen_zero(p->rpid) || !ast_strlen_zero(p->rpid_from))  
 		return;
 
-	if (p->owner && p->owner->cid.cid_num)
+	if (p->owner && !ast_strlen_zero(p->owner->cid.cid_num))
 		clid = p->owner->cid.cid_num;
 	if (p->owner && p->owner->cid.cid_name)
 		clin = p->owner->cid.cid_name;