Merged revisions 86982 via svnmerge from
authorJason Parker <jparker@digium.com>
Wed, 24 Oct 2007 20:59:00 +0000 (20:59 +0000)
committerJason Parker <jparker@digium.com>
Wed, 24 Oct 2007 20:59:00 +0000 (20:59 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

(closes issue #11079)
........
r86982 | qwell | 2007-10-24 15:56:47 -0500 (Wed, 24 Oct 2007) | 5 lines

Correctly respect hidecalleridname configuration option.
Simplify code slightly in the process.

Issue 11079, reported by ddv2005

........

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

channels/chan_zap.c

index 21ea7ed..f38d862 100644 (file)
@@ -2336,17 +2336,18 @@ static int zt_call(struct ast_channel *ast, char *rdest, int timeout)
                        c++;
                else
                        c = dest;
-               if (!p->hidecalleridname)
-                       n = ast->cid.cid_name;
-               else
-                       n = NULL;
+
+               l = NULL;
+               n = NULL;
+
                if (!p->hidecallerid) {
                        l = ast->cid.cid_num;
-                       n = ast->cid.cid_name;
-               } else {
-                       l = NULL;
-                       n = NULL;
+                       if (!p->hidecalleridname) {
+                               n = ast->cid.cid_name;
+                       }
                }
+
+
                if (strlen(c) < p->stripmsd) {
                        ast_log(LOG_WARNING, "Number '%s' is shorter than stripmsd (%d)\n", c, p->stripmsd);
                        ast_mutex_unlock(&p->lock);