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
This commit is contained in:
Richard Mudgett
2010-11-09 22:52:00 +00:00
parent 105a5c146e
commit e2c8ef9179

View File

@@ -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)