From cb8170e8c598aca943d069a0f44b950f510cab54 Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Fri, 13 Jul 2007 20:16:40 +0000 Subject: [PATCH] Merged revisions 75078 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ................ r75078 | mmichelson | 2007-07-13 15:15:30 -0500 (Fri, 13 Jul 2007) | 13 lines Merged revisions 75066 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.2 ........ r75066 | mmichelson | 2007-07-13 15:10:39 -0500 (Fri, 13 Jul 2007) | 5 lines Fixed an issue where chanspy flags were uninitialized if no options were passed. What triggered this investigation was an IRC chat where some people's quiet flags were set while others' weren't even though none of them had specified the q option. ........ ................ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@75082 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- apps/app_chanspy.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index 8081fb1d89..03a6322f89 100644 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -674,7 +674,8 @@ static int chanspy_exec(struct ast_channel *chan, void *data) if (ast_test_flag(&flags, OPTION_PRIVATE)) ast_set_flag(&flags, OPTION_WHISPER); - } + } else + ast_clear_flag(&flags, AST_FLAGS_ALL); oldwf = chan->writeformat; if (ast_set_write_format(chan, AST_FORMAT_SLINEAR) < 0) { @@ -758,7 +759,8 @@ static int extenspy_exec(struct ast_channel *chan, void *data) if (ast_test_flag(&flags, OPTION_PRIVATE)) ast_set_flag(&flags, OPTION_WHISPER); - } + } else + ast_clear_flag(&flags, AST_FLAGS_ALL); oldwf = chan->writeformat; if (ast_set_write_format(chan, AST_FORMAT_SLINEAR) < 0) {