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.
........

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

diff --git a/main/channel.c b/main/channel.c
index f4b34a26aa932cd695a2109bb35153745cee1b59..60ccafffdd1b5591b8485d264477a80873b65e88 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -6511,7 +6511,7 @@ done:
 
        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)