--- a/src/context.h	Sat Jul 14 12:25:17 2007 -0700
+++ b/src/context.h	Sun Aug 26 19:03:17 2007 -0700
@@ -142,6 +142,7 @@
 	bool			host_random;		// pick a random selection of host names rather than error for excessive hosts
 	int 			tag_limit;			// limit on bad html tags
 	char *			tag_limit_message;	// error message for excessive bad html tags
+	int 			spamassassin_limit; // max score from spamassassin
 	dnsblp_map		dnsbl_names;		// name to dnsbl mapping for lists that are available in this context and children
 	dnsblp_list 	dnsbl_list; 		// list of dnsbls to be used in this context
 	int 			default_rcpt_rate;	// if not specified per user
@@ -190,6 +191,7 @@
 	void		add_cctld(char *cctld)						{content_cctlds.insert(cctld);};
 
 	void		set_host_limit(int limit)					{host_limit 		= limit;};
+	void		set_spamassassin_limit(int limit)			{spamassassin_limit = limit;  };
 	void		set_host_message(char *message) 			{host_limit_message = message;};
 	void		set_host_random(bool random)				{host_random		= random;};
 	void		set_tag_limit(int limit)					{tag_limit			= limit;};
@@ -202,6 +204,7 @@
 
 	bool			get_content_filtering() 				{return content_filtering;};
 	int 			get_host_limit()						{return host_limit;};
+	int 			get_spamassassin_limit()				{return spamassassin_limit;};
 	bool			get_host_random()						{return host_random;};
 	char*			get_content_suffix();
 	char*			get_content_message();
@@ -213,7 +216,7 @@
 	string_set& 	get_html_tags();
 	dnsblp_list&	get_dnsbl_list();
 
-	bool		acceptable_content(recorder &memory, char *&msg);
+	bool		acceptable_content(recorder &memory, int score, char *&msg);
 	bool		ignore_host(char *host);
 
 	void		dump(bool isdefault, int level = 0);
@@ -274,6 +277,7 @@
 extern char *token_rbrace;
 extern char *token_semi;
 extern char *token_soft;
+extern char *token_spamassassin;
 extern char *token_substitute;
 extern char *token_tld;
 extern char *token_unknown;