[Asterisk-cvs] asterisk/channels chan_sip.c,1.643,1.644

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/channels
In directory mongoose.digium.com:/tmp/cvs-serv25844/channels

Modified Files:
	chan_sip.c 
Log Message:
Only use default callerid if it's specified (bug #3486)


Index: chan_sip.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_sip.c,v
retrieving revision 1.643
retrieving revision 1.644
diff -u -d -r1.643 -r1.644
--- chan_sip.c	29 Jan 2005 23:19:01 -0000	1.643
+++ chan_sip.c	1 Feb 2005 19:25:40 -0000	1.644
@@ -3745,7 +3745,7 @@
 		l = p->owner->cid.cid_num;
 		n = p->owner->cid.cid_name;
 	}
-	if (!l || !ast_isphonenumber(l))
+	if ((!l || !ast_isphonenumber(l)) && default_callerid[0])
 			l = default_callerid;
 	/* if user want's his callerid restricted */
 	if (p->callingpres & AST_PRES_PROHIB_USER_NUMBER_NOT_SCREENED) {