Merged revisions 38234 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r38234 | file | 2006-07-26 11:26:06 -0400 (Wed, 26 Jul 2006) | 2 lines

Put default callerid into contact when the one specified is either NULL or has a zero string length. (issue #7590 reported by key2)

........

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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index f3ff61504ec69d49c0efa5a8b7a09fd68c567786..4020957b8c41660a9edcee07f9e65fb824974d8a 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -6286,7 +6286,7 @@ static void initreqprep(struct sip_request *req, struct sip_pvt *p, int sipmetho
                l = CALLERID_UNKNOWN;
                n = l;
        }
-       if (!l)
+       if (ast_strlen_zero(l))
                l = default_callerid;
        if (ast_strlen_zero(n))
                n = l;