--- a/xml/dnsbl.in	Wed Mar 15 08:21:51 2006 -0800
+++ b/xml/dnsbl.in	Thu Mar 16 15:20:37 2006 -0800
@@ -520,21 +520,26 @@
 STATEMENT  = (DNSBL | DNSBLLIST | CONTENT | ENV-TO | VERIFY |
                                            CONTEXT | ENV-FROM) ";"
 
-DNSBL      = "dnsbl" NAME DNSPREFIX ERROR-MSG
+DNSBL      = "dnsbl" NAME DNSPREFIX ERROR-MSG1
 
 DNSBLLIST  = "dnsbl_list" {NAME}+
 
 CONTENT    = "content" ("on" | "off") "{" {CONTENT-ST}+ "}"
 CONTENT-ST = (FILTER | URIBL | IGNORE | TLD | CCTLD | HTML-TAGS |
               HTML-LIMIT | HOST-LIMIT) ";"
-FILTER     = "filter" DNSPREFIX ERROR-MSG
-URIBL      = "uribl"  DNSPREFIX ERROR-MSG
+FILTER     = "filter" DNSPREFIX ERROR-MSG2
+URIBL      = "uribl"  DNSPREFIX ERROR-MSG3
 IGNORE     = "ignore"     "{" {HOSTNAME [";"]}+ "}"
 TLD        = "tld"        "{" {TLD      [";"]}+ "}"
 CCTLD      = "cctld"      "{" {TLD      [";"]}+ "}"
 HTML-TAGS  = "html_tags"  "{" {HTMLTAG  [";"]}+ "}"
-ERROR-MSG  = string containing exactly two %s replacement tokens
-             for the client ip address
+ERROR-MSG1 = string containing exactly two %s replacement tokens
+             both are replaced with the client ip address
+ERROR-MSG2 = string containing exactly two %s replacement tokens
+             the first is replaced with the hostname, and the second
+             is replaced with the ip address
+ERROR-MSG3 = string containing exactly two %s replacement tokens
+             both are replaced with the hostname
 
 HTML-LIMIT = "html_limit" ("on" INTEGER ERROR-MSG | "off")