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

Modified Files:
        chan_zap.c 
Log Message:
don't ignore hardcoded CLID from zapata.conf when usecallerid=no


Index: chan_zap.c
===================================================================
RCS file: /usr/cvsroot/asterisk/channels/chan_zap.c,v
retrieving revision 1.473
retrieving revision 1.474
diff -u -d -r1.473 -r1.474
--- chan_zap.c  13 Jul 2005 15:13:12 -0000      1.473
+++ chan_zap.c  13 Jul 2005 20:22:29 -0000      1.474
@@ -5844,13 +5844,15 @@
                }
                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);

_______________________________________________
Asterisk-Cvs mailing list
[email protected]
http://lists.digium.com/mailman/listinfo/asterisk-cvs

Reply via email to