Fix privacy manager to "do the right things" with blank, but present, callerid (bug...
authorMark Spencer <markster@digium.com>
Sun, 9 Jan 2005 10:37:03 +0000 (10:37 +0000)
committerMark Spencer <markster@digium.com>
Sun, 9 Jan 2005 10:37:03 +0000 (10:37 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4728 65c4cc65-6c06-0410-ace0-fbb531ad65f3

apps/app_privacy.c

index 8cfbd88..2337c4b 100755 (executable)
@@ -69,13 +69,10 @@ privacy_exec (struct ast_channel *chan, void *data)
        struct ast_config *cfg;
 
        LOCAL_USER_ADD (u);
        struct ast_config *cfg;
 
        LOCAL_USER_ADD (u);
-       if (chan->cid.cid_num)
-       {
+       if (chan->cid.cid_num && !ast_strlen_zero(chan->cid.cid_num)) {
                if (option_verbose > 2)
                        ast_verbose (VERBOSE_PREFIX_3 "CallerID Present: Skipping\n");
                if (option_verbose > 2)
                        ast_verbose (VERBOSE_PREFIX_3 "CallerID Present: Skipping\n");
-       }
-       else
-       {
+       } else {
                /*Answer the channel if it is not already*/
                if (chan->_state != AST_STATE_UP) {
                        res = ast_answer(chan);
                /*Answer the channel if it is not already*/
                if (chan->_state != AST_STATE_UP) {
                        res = ast_answer(chan);