Merged revisions 61799 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r61799 | russell | 2007-04-25 11:22:07 -0500 (Wed, 25 Apr 2007) | 11 lines

Merged revisions 61798 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r61798 | russell | 2007-04-25 11:20:38 -0500 (Wed, 25 Apr 2007) | 3 lines

Fix a typo where cid_num got copied instead of cid_ani.
(issue #9587, reported and patched by xrg)

........

................

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

diff --git a/channels/chan_zap.c b/channels/chan_zap.c
index acafe2d6b0e5235fc9940a5dcfd39769d6f793af..f401b85e271e5f04ab22d7c3259e7cbe86b35f27 100644 (file)
--- a/channels/chan_zap.c
+++ b/channels/chan_zap.c
@@ -5641,7 +5641,7 @@ static struct ast_channel *zt_new(struct zt_pvt *i, int state, int startpbx, int
        tmp->cid.cid_num = ast_strdup(i->cid_num);
        tmp->cid.cid_name = ast_strdup(i->cid_name);
        if (!ast_strlen_zero(i->cid_ani))
-               tmp->cid.cid_ani = ast_strdup(i->cid_num);
+               tmp->cid.cid_ani = ast_strdup(i->cid_ani);
        else    
                tmp->cid.cid_ani = ast_strdup(i->cid_num);
 #else