mirror of
https://github.com/asterisk/asterisk.git
synced 2025-11-01 19:43:03 +00:00
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
This commit is contained in:
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user