automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@38249 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Automerge script
2006-07-26 16:03:00 +00:00
parent 6342e0c54a
commit 7211dd853e

View File

@@ -4934,7 +4934,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;