--- a/xml/dnsbl.in	Sun Apr 08 16:17:53 2012 -0700
+++ b/xml/dnsbl.in	Mon Apr 09 18:02:05 2012 -0700
@@ -661,10 +661,11 @@
              | RATE-LIMIT) ";"
 
 DNSBL      = "dnsbl" NAME DNSPREFIX ERROR-MSG1
-DNSBLLIST  = "dnsbl_list" {NAME}+
+DNSBLLIST  = "dnsbl_list" {NAME}*
 
-DNSWL      = "dnswl" NAME DNSPREFIX INTEGER
-DNSWLLIST  = "dnswl_list" {NAME}+
+DNSWL      = "dnswl" NAME DNSPREFIX LEVEL
+DNSWLLIST  = "dnswl_list" {NAME}*
+LEVEL      = INTEGER
 
 CONTENT    = "content" ("on" | "off") "{" {CONTENT-ST}+ "}"
 CONTENT-ST = (FILTER | URIBL | IGNORE | TLD     | CCTLD   | HTML-TAGS |
@@ -708,8 +709,11 @@
 FROM-ADDR  = ADDRESS VALUE [";"]
 DCC-FROM   = "dcc_from" "{" DCCINCLUDEFILE "}" ";"
 
-RATE-LIMIT = "rate_limit" [DEFAULTLIMIT] "{" (RATE)+ "}"
+RATE-LIMIT     = "rate_limit" [DEFAULT_LIMIT [DAILY_MULTIPLE]] "{" (RATE)+ "}"
 RATE       = USER LIMIT [";"]
+LIMIT          = INTEGER
+DEFAULT_LIMIT  = INTEGER
+DAILY_MULTIPLE = INTEGER
 
 DEFAULT    = ("white" | "black" | "unknown" | "inherit" | "")
 ADDRESS    = (USER@ | DOMAIN | USER@DOMAIN)
@@ -750,7 +754,9 @@
     };
 
     // hourly recipient rate limit by smtp auth client id
-    rate_limit 30 { // default
+    // default hourly limit is 30
+    // daily limits are 4 times the hourly limit
+    rate_limit 30 4 { // default
         #fred 100;   // override default limits
         #joe  10;    // ""
     };
@@ -825,6 +831,8 @@
     };
 
     context blacklist {
+        dnsbl_list ;
+        dnswl_list ;
         env_to {
             # dcc_to many { include "/var/dcc/whitecommon"; };
         };