--- a/src/context.h	Thu Oct 04 22:45:21 2007 -0700
+++ b/src/context.h	Sat Oct 06 10:56:35 2007 -0700
@@ -218,11 +218,11 @@
 	void		set_bulk(int b) 							{dcc_bulk_threshold = b; };
 
 	bool			get_content_filtering() 				{return content_filtering; };
-	bool			get_require()							{return require_match;	   };
-	bool			get_grey()								{return dcc_greylist;	   };
-	int 			get_bulk()								{return dcc_bulk_threshold;};
-	int 			get_host_limit()						{return host_limit; 	   };
-	bool			get_host_random()						{return host_random;	   };
+	bool			get_require()							{return content_filtering && require_match; 	};
+	bool			get_grey()								{return content_filtering && dcc_greylist;		};
+	int 			get_bulk()								{return (content_filtering) ? dcc_bulk_threshold : 0;};
+	int 			get_host_limit()						{return (content_filtering) ? host_limit		 : 0;};
+	bool			get_host_random()						{return (content_filtering) ? host_random		 : 0;};
 	int 			get_spamassassin_limit()				{return (content_filtering) ? spamassassin_limit : 0;};
 	char*			get_content_suffix();
 	char*			get_content_message();