diff options
| author | Richard Mudgett <rmudgett@digium.com> | 2010-11-09 22:52:00 +0000 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2010-11-09 22:52:00 +0000 |
| commit | e2c8ef9179ee8de51849e409c859f8e5795a64cd (patch) | |
| tree | fdb9fa609804eb961a1945ec75189483255e5d33 /main | |
| parent | 105a5c146ec4acce7053f5bb255c0792efc496e6 (diff) | |
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
Diffstat (limited to 'main')
| -rw-r--r-- | main/channel.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/channel.c b/main/channel.c index f4b34a26a..60ccafffd 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) |