From: Joshua Colp <jcolp@digium.com>
Date: Tue, 3 Nov 2009 15:38:57 +0000 (+0000)
Subject: Merged revisions 227167 via svnmerge from
X-Git-Tag: 1.6.1.10-rc1~25
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9366e1f3f77b62c89df281b8b0105b079d07ecf5;p=thirdparty%2Fasterisk.git

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
  ........
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@227169 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index f6d31717ce..93b56daf8a 100644
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -9752,7 +9752,7 @@ static void build_rpid(struct sip_pvt *p)
 	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;