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 f6d31717ce498642052eef4f57f0b839f3da9b84..93b56daf8aa527762c737df14c0619edfa8a5b0c 100644 (file)
--- 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;