diff xml/dnsbl.in @ 321:e172dc10fe24

add dkim white/black listing
author Carl Byington <carl@five-ten-sg.com>
date Sat, 17 Dec 2016 13:47:28 -0800
parents 1f40b1b0ad31
children 9f8411f3919c
line wrap: on
line diff
--- a/xml/dnsbl.in	Sat Dec 17 09:46:40 2016 -0800
+++ b/xml/dnsbl.in	Sat Dec 17 13:47:28 2016 -0800
@@ -25,7 +25,7 @@
 
     <refentry id="@PACKAGE@.1">
         <refentryinfo>
-            <date>2013-05-22</date>
+            <date>2016-12-17</date>
             <author>
                 <firstname>Carl</firstname>
                 <surname>Byington</surname>
@@ -666,7 +666,7 @@
 
     <refentry id="@PACKAGE@.conf.5">
         <refentryinfo>
-            <date>2013-05-22</date>
+            <date>2016-12-17</date>
             <author>
                 <firstname>Carl</firstname>
                 <surname>Byington</surname>
@@ -706,7 +706,7 @@
 CONTEXT    = "context" NAME "{" {STATEMENT}+ "}"
 STATEMENT  = (DNSBL    | DNSBLLIST | DNSWL   | DNSWLLIST | CONTENT | ENV-TO
              | VERIFY  | GENERIC   | W_REGEX | AUTOWHITE | CONTEXT | ENV-FROM
-             | RATE-LIMIT | REQUIRERDNS) ";"
+             | DKIM_SIGNER | DKIM_FROM | RATE-LIMIT | REQUIRERDNS) ";"
 
 DNSBL      = "dnsbl" NAME DNSPREFIX ERROR-MSG1
 DNSBLLIST  = "dnsbl_list" {NAME}*
@@ -742,6 +742,10 @@
 DCCGREY    = "dcc_greylist"         ("yes" | "no")
 DCCBULK    = "dcc_bulk_threshold"   (INTEGER | "many" | "off")
 
+DKIMSIGNER = "dkim_signer" "{" {SIGNING_DOMAIN DEF [";"]}+ "}"
+DKIMFROM   = "dkim_from"   "{" {HEADER_FROM_DOMAIN DKIMVALUE SIGNING_DOMAIN [";"]}+ "}"
+DKIMVALUE  = "signed_white" | "signed_black" | "require_signed"
+
 ENV-TO     = "env_to"     "{" {(TO-ADDR | DCC-TO)}+ "}"
 TO-ADDR    = ADDRESS [";"]
 DCC-TO     = "dcc_to" ("ok" | "many") "{" DCCINCLUDEFILE "}" ";"
@@ -766,7 +770,8 @@
 DEFAULT_IP_LIMIT    = INTEGER
 DAILY_MULTIPLE_IP   = INTEGER
 
-DEFAULT    = ("white" | "black" | "unknown" | "inherit" | "")
+DEF        = ("white" | "black")
+DEFAULT    = (DEF | "unknown" | "inherit" | "")
 ADDRESS    = (USER@ | DOMAIN | USER@DOMAIN)
 VALUE      = ("white" | "black" | "unknown" | "inherit" | CHILD-CONTEXT-NAME)]]></literallayout>
         </refsect1>