# HG changeset patch
# User carl
# Date 1094678209 25200
# Node ID 44babba1a9b923ece056435cd61d1d2b4e054b13
# Parent  dca56b2de01953d6ede22b2dfcdd1f9a948718b0
updates for 3.6, better documentation on removing content filtering, missing some files in cvs


diff -r dca56b2de019 -r 44babba1a9b9 src/dnsbl.cpp
--- a/src/dnsbl.cpp	Wed Sep 08 11:58:45 2004 -0700
+++ b/src/dnsbl.cpp	Wed Sep 08 14:16:49 2004 -0700
@@ -595,12 +595,11 @@
 
 
 ////////////////////////////////////////////////
-//  check the dnsbls specified for this recipient
+//  check the hosts from the body against the content dnsbl
 //
 static status check_hosts(mlfiPriv &priv, char *&host, int &ip);
 static status check_hosts(mlfiPriv &priv, char *&host, int &ip) {
     CONFIG     &dc   = *priv.pc;
-    if (!dc.content_suffix) return oksofar;
     int count = 0;
     ns_map nameservers;
     bool ran = priv.pc->host_random;
@@ -802,6 +801,7 @@
     mlfiPriv &priv = *MLFIPRIV;
     if (priv.authenticated) return SMFIS_CONTINUE;
     if (priv.only_whites)   return SMFIS_CONTINUE;
+    if (!priv.pc->content_suffix) return SMFIS_CONTINUE;
     priv.scanner->scan(data, len);
     return SMFIS_CONTINUE;
 }
@@ -816,6 +816,7 @@
     // process end of message
     if (priv.authenticated ||
         priv.only_whites   ||
+        (!priv.pc->content_suffix) ||
         ((st=check_hosts(priv, host, ip)) == oksofar)) rc = SMFIS_CONTINUE;
     else {
         if (!priv.have_whites) {