From: Richard Mudgett <rmudgett@digium.com>
Date: Tue, 9 Nov 2010 22:52:00 +0000 (+0000)
Subject: Merged revisions 294466 via svnmerge from
X-Git-Tag: 11.0.0-beta1~2132
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e2c8ef9179ee8de51849e409c859f8e5795a64cd;p=thirdparty%2Fasterisk.git

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 f4b34a26aa..60ccafffdd 100644
--- 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)