From: Russell Bryant <russell@russellbryant.com>
Date: Mon, 7 Feb 2005 03:25:22 +0000 (+0000)
Subject: only use default cid if specified (bug #3486)
X-Git-Tag: 1.0.11.1~236
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a46350e31590f203781353549ef0ba4e7b3119dd;p=thirdparty%2Fasterisk.git

only use default cid if specified (bug #3486)


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

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index e768b1c08b..60d9321004 100755
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -3669,7 +3669,7 @@ static void initreqprep(struct sip_request *req, struct sip_pvt *p, char *cmd, c
 		ast_callerid_parse(cid, &n, &l);
 		if (l) 
 			ast_shrink_phone_number(l);
-		if (!l || !ast_isphonenumber(l))
+		if ((!l || !ast_isphonenumber(l)) && default_callerid[0])
 				l = default_callerid;
 	}
 	/* if user want's his callerid restricted */