summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin P. Fleming <kpfleming@digium.com>2005-07-13 20:22:29 +0000
committerKevin P. Fleming <kpfleming@digium.com>2005-07-13 20:22:29 +0000
commitf50c27c3552764964b8b48726b49c8fd86aaa498 (patch)
treed6d578ab0a5a0f384bc3f21d974fe5da16899d20
parent9a7a5d56237c32bc59ea1e4be6d8591db9aab76b (diff)
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
-rwxr-xr-xchannels/chan_zap.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index 1eadea3e6..7e7c01790 100755
--- 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);