[asterisk-commits] russell: trunk r61800 - in /trunk: ./ channels/chan_zap.c

[asterisk-commits at lists.digium.com]

Author: russell
Date: Wed Apr 25 11:23:00 2007
New Revision: 61800

URL: http://svn.digium.com/view/asterisk?view=rev&rev=61800
Log:
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)

........

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

Modified:
    trunk/   (props changed)
    trunk/channels/chan_zap.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/chan_zap.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_zap.c?view=diff&rev=61800&r1=61799&r2=61800
==============================================================================
--- trunk/channels/chan_zap.c (original)
+++ trunk/channels/chan_zap.c Wed Apr 25 11:23:00 2007
@@ -5641,7 +5641,7 @@
 	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