From: Russell Bryant <russell@russellbryant.com>
Date: Wed, 25 Apr 2007 16:23:00 +0000 (+0000)
Subject: Merged revisions 61799 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2811
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f5d4a16cda0dfd53931deeafa91b5fe1724bc85f;p=thirdparty%2Fasterisk.git

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 acafe2d6b0..f401b85e27 100644
--- 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