don't ignore hardcoded CLID from zapata.conf when usecallerid=no

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

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 1eadea3..7e7c017 100755 (executable)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -5844,13 +5844,15 @@ static void *ss_thread(void *data)
                }
                else
                        cs = NULL;
-               if (chan->cid.cid_num) {
+               if (number || name) {
+                   if (chan->cid.cid_num) {
                        free(chan->cid.cid_num);
                        chan->cid.cid_num = NULL;
-               }
-               if (chan->cid.cid_name) {
+                   }
+                   if (chan->cid.cid_name) {
                        free(chan->cid.cid_name);
                        chan->cid.cid_name = NULL;
+                   }
                }
                if (number)
                        ast_shrink_phone_number(number);