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 e768b1c08bf77acc55aa2d1dc5c3de42d23ce722..60d932100429e92df6a1ab876c4c96e240af4f65 100755 (executable)
--- 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 */