# HG changeset patch
# User carl
# Date 1191699048 25200
# Node ID cb5c0d7ec4512e9f29b2f898d20c08efff784096
# Parent  7a722f482bfbd2cf9b74d8b52418b18adc7c01a0
embedded dcc filtering


diff -r 7a722f482bfb -r cb5c0d7ec451 dnsblnogrey
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/dnsblnogrey	Sat Oct 06 12:30:48 2007 -0700
@@ -0,0 +1,8 @@
+#this file should be moved to something like
+#/var/dcc/userdirs/local/dnsblnogrey/whiteclnt
+#
+#we pass 'dnsblnogrey' as the local username to dccifd to disable
+#greylisting for those recipients that don't want greylisting
+#
+#
+option greylist-off
diff -r 7a722f482bfb -r cb5c0d7ec451 src/dnsbl.cpp
--- a/src/dnsbl.cpp	Sat Oct 06 12:17:02 2007 -0700
+++ b/src/dnsbl.cpp	Sat Oct 06 12:30:48 2007 -0700
@@ -1179,11 +1179,11 @@
 		// assert env_to not empty, it contains the
 		// non-whitelisted folks that want content filtering
 		int score = (priv.want_spamassassin) ? priv.assassin->mlfi_eom() : 0;
-		bool greylist = false;
-		int  dccbulk  = 0;
-		if (priv.want_dccgrey || priv.want_dccbulk) priv.dccifd->mlfi_eom(greylist, dccbulk);
+		bool grey = false;
+		int  bulk = 0;
+		if (priv.want_dccgrey || priv.want_dccbulk) priv.dccifd->mlfi_eom(grey, bulk);
 
-		if (priv.want_dccgrey && greylist) {
+		if (priv.want_dccgrey && grey) {
 			smfi_setreply(ctx, "452", "4.2.1", "temporary greylist embargoed");
 			rc = SMFIS_TEMPFAIL;
 		}
@@ -1196,7 +1196,7 @@
 			for (context_map::iterator i=priv.env_to.begin(); i!=priv.env_to.end(); i++) {
 				char *rcpt	 = (*i).first;
 				CONTEXT &con = *((*i).second);
-				if (!con.acceptable_content(*priv.memory, score, dccbulk, msg)) {
+				if (!con.acceptable_content(*priv.memory, score, bulk, msg)) {
 					// bad html tags or excessive hosts or
 					// high spam assassin score or dcc bulk threshold exceedeed
 					smfi_delrcpt(ctx, rcpt);