changeset 55:44babba1a9b9

updates for 3.6, better documentation on removing content filtering, missing some files in cvs
author carl
date Wed, 08 Sep 2004 14:16:49 -0700
parents dca56b2de019
children 57607387263d
files src/dnsbl.cpp
diffstat 1 files changed, 8 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- 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) {