--- a/xml/sample.conf	Sun Apr 25 11:36:08 2004 -0700
+++ b/xml/sample.conf	Mon Apr 26 09:28:30 2004 -0700
@@ -4,13 +4,6 @@
 # tokens are separated by spaces or tabs
 #
 #
-# content:
-#   second token is the dns suffix used for the actual lookups
-#   third  token? is a string enclosed in single quotes, so it
-#       is not really a token. This is the error message, with
-#       up to two %s parameters for the url and the client ip
-#       address.
-#
 # dnsbl:
 #   second token is the name of this dnsbl
 #   third  token is the dns suffix used for the actual lookups
@@ -67,11 +60,11 @@
 #   third token is the path name of the dcc whiteclnt config file to be
 #   included.
 #       entries from the dcc config are mapped as:
-#           ok                   -> WHITE (TAG below)
-#           many                 -> BLACK (TAG below)
-#           env_to               -> env_to xxx TAG
-#           env_from             -> env_from EMAP xxx TAG TAG
-#           substitute mail_host -> env_from EMAP xxx TAG TAG
+#           ok -> WHITE
+#           many -> BLACK
+#           env_from -> env_from EMAP xxx
+#           env_to   -> env_to
+#           substitute mail_host -> env_from EMAP xxx
 #
 #
 #
@@ -79,8 +72,6 @@
 # define the dnsbls to use
 #
 #
-content         sbl-xbl.spamhaus.org        'Mail containing %s rejected - sbl; see http://www.spamhaus.org/query/bl?ip=%s'
-#
 dnsbl   LOCAL   blackholes.five-ten-sg.com  'Mail from %s rejected - local; see http://www.five-ten-sg.com/blackhole.php?%s'
 dnsbl   SPEWS   blackholes.spews.org        'Mail from %s rejected - spews; see http://www.spews.org/ask.cgi?x=%s'
 dnsbl   SBL     sbl-xbl.spamhaus.org        'Mail from %s rejected - sbl; see http://www.spamhaus.org/query/bl?ip=%s'
@@ -104,7 +95,7 @@
 # special list for the vp
 env_from    TEST    dummy-token             DEFAULT # inherit the currently defined DEFAULT env_from mapping
 env_from    TEST    nai.com                 BLACK   # the vp does not like nai
-env_from    TEST    yahoo.com               DEFAULT # override the blacklisting of yahoo
+env_from    TEST    yahoo.com               DEFAULT #
 env_from    TEST    mother@spammyisp.com    WHITE   # suppresses dnsbl checking
 
 
@@ -121,11 +112,11 @@
 # specify dnsbl_lists and env_from maps to use for clients domains
 #
 env_to      mydomain.com            DEFAULT DEFAULT
-env_to      customer1.com           CUST1   CUST1       # all customer 1 domains use just sbl
-env_to      customer1a.com          CUST1   CUST1
-env_to      customer1b.com          CUST1   CUST1
-env_to      customer2.com           CUST2   CUST2       # all customer 2 domains use spews and sbl
-env_to      customer2a.com          CUST2   CUST2
+env_to      customer1.com           CUST1   DEFAULT     # all customer 1 domains use just sbl
+env_to      customer1a.com          CUST1   DEFAULT
+env_to      customer1b.com          CUST1   DEFAULT
+env_to      customer2.com           CUST2   DEFAULT     # all customer 2 domains use spews and sbl
+env_to      customer2a.com          CUST2   DEFAULT
 
 
 ##############################################
@@ -133,20 +124,4 @@
 # file names are single tokens, no embedded blanks
 #
 include dnsbl.conf      # this will generate a recursive include file syslog error message
-
-
-##############################################
-#
-# fetch the normal dcc whitelist file and put the entries into the DEFAULT
-# envelope-from-map.  The ok/many tags in the DCC file turn into
-# WHITE/BLACK entries when imported.  The env_to entries from the DCC
-# config turn into env_to entries here, and are therefore global to all
-# domains.  The assumption is that a client will only have whitelist
-# env_to entries for their own domains, in their own dcc config file.  The
-# env_from and substitute mail_host entries turn into env_from entries in
-# the named (DEFAULT in this case) envelope-from-map.
-#
-#
-include_dcc  DEFAULT /var/dcc/whitecommon
-include_dcc  CUST1   /var/dcc/whitecommon.cust1
-include_dcc  CUST2   /var/dcc/whitecommon.cust2
+include_dcc  DEFAULT /var/dcc/whitecommon   # this includes the default dcc whitelist file