Merged revisions 228189 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
  r228189 | jpeeler | 2009-11-05 15:23:06 -0600 (Thu, 05 Nov 2009) | 11 lines
  
  Fix the fix for chanspy option o 
  
  In 224178, I assumed the uploaded patch was correct as it had received positive
  feedback. The flags were being checked in the incorrect location. Upon testing
  the fix this time it was also found that the flags from the dialplan weren't
  being copied to the chanspy_translation_helper.
  
  (closes issue #16167)
  Reported by: marhbere
........


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

apps/app_chanspy.c

@@ -253,7 +253,7 @@ static int spy_generate(struct ast_channel *chan, void *data, int len, int sampl
 		return -1;
 	}
 
-	if (ast_test_flag(chan, OPTION_READONLY)) {
+	if (ast_test_flag(&csth->spy_audiohook, OPTION_READONLY)) {
 		/* Option 'o' was set, so don't mix channel audio */
 		f = ast_audiohook_read_frame(&csth->spy_audiohook, samples, AST_AUDIOHOOK_DIRECTION_READ, AST_FORMAT_SLINEAR);
 	} else {
@@ -363,6 +363,7 @@ static int channel_spy(struct ast_channel *chan, struct chanspy_ds *spyee_chansp
 	ast_verb(2, "Spying on channel %s\n", name);
 
 	memset(&csth, 0, sizeof(csth));
+	ast_copy_flags(&csth.spy_audiohook, flags, AST_FLAGS_ALL);
 
 	ast_audiohook_init(&csth.spy_audiohook, AST_AUDIOHOOK_TYPE_SPY, "ChanSpy");