[svn-commits] rmudgett: trunk r294467 - in /trunk: ./ main/channel.c

[SVN commits to the Digium repositories]

Author: rmudgett
Date: Tue Nov  9 16:52:00 2010
New Revision: 294467

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=294467
Log:
Merged revisions 294466 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r294466 | rmudgett | 2010-11-09 16:46:45 -0600 (Tue, 09 Nov 2010) | 1 line
  
  Allow ast_do_masquerade() failure to be reported again.
........

Modified:
    trunk/   (props changed)
    trunk/main/channel.c

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

Modified: trunk/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/trunk/main/channel.c?view=diff&rev=294467&r1=294466&r2=294467
==============================================================================
--- trunk/main/channel.c (original)
+++ trunk/main/channel.c Tue Nov  9 16:52:00 2010
@@ -6511,7 +6511,7 @@
 
 	ao2_unlock(channels);
 
-	return 0;
+	return res;
 }
 
 void ast_set_callerid(struct ast_channel *chan, const char *cid_num, const char *cid_name, const char *cid_ani)