comparison xml/dnsbl.in @ 360:17f21fcd44a8

allow quoted comma separated multiple signers in the dkim_from config entries
author Carl Byington <carl@five-ten-sg.com>
date Mon, 16 Jan 2017 11:13:40 -0800
parents 9f8411f3919c
children a8cf6a3da907
comparison
equal deleted inserted replaced
359:3dfa93d65701 360:17f21fcd44a8
742 REQUIRE = "require_match" ("yes" | "no") 742 REQUIRE = "require_match" ("yes" | "no")
743 DCCGREY = "dcc_greylist" ("yes" | "no") 743 DCCGREY = "dcc_greylist" ("yes" | "no")
744 DCCBULK = "dcc_bulk_threshold" (INTEGER | "many" | "off") 744 DCCBULK = "dcc_bulk_threshold" (INTEGER | "many" | "off")
745 745
746 DKIMSIGNER = "dkim_signer" "{" {SIGNING_DOMAIN DEF [";"]}+ "}" 746 DKIMSIGNER = "dkim_signer" "{" {SIGNING_DOMAIN DEF [";"]}+ "}"
747 DKIMFROM = "dkim_from" "{" {HEADER_FROM_DOMAIN DKIMVALUE SIGNING_DOMAIN [";"]}+ "}" 747 DKIMFROM = "dkim_from" "{" {HEADER_FROM_DOMAIN DKIMVALUE SIGNERS [";"]}+ "}"
748 DKIMVALUE = "signed_white" | "signed_black" | "require_signed" 748 DKIMVALUE = "signed_white" | "signed_black" | "require_signed"
749 SIGNERS = quoted comma separated SIGNING_DOMAINs no whitespace
749 750
750 ENV-TO = "env_to" "{" {(TO-ADDR | DCC-TO)}+ "}" 751 ENV-TO = "env_to" "{" {(TO-ADDR | DCC-TO)}+ "}"
751 TO-ADDR = ADDRESS [";"] 752 TO-ADDR = ADDRESS [";"]
752 DCC-TO = "dcc_to" ("ok" | "many") "{" DCCINCLUDEFILE "}" ";" 753 DCC-TO = "dcc_to" ("ok" | "many") "{" DCCINCLUDEFILE "}" ";"
753 754
769 DEFAULT_RCPT_LIMIT = INTEGER 770 DEFAULT_RCPT_LIMIT = INTEGER
770 DAILY_MULTIPLE_RCPT = INTEGER 771 DAILY_MULTIPLE_RCPT = INTEGER
771 DEFAULT_IP_LIMIT = INTEGER 772 DEFAULT_IP_LIMIT = INTEGER
772 DAILY_MULTIPLE_IP = INTEGER 773 DAILY_MULTIPLE_IP = INTEGER
773 774
774 DEF = ("white" | "black") 775 DEF = ("white" | "black" | "unknown")
775 DEFAULT = (DEF | "unknown" | "inherit" | "") 776 DEFAULT = (DEF | "inherit" | "")
776 ADDRESS = (USER@ | DOMAIN | USER@DOMAIN) 777 ADDRESS = (USER@ | DOMAIN | USER@DOMAIN)
777 VALUE = ("white" | "black" | "unknown" | "inherit" | CHILD-CONTEXT-NAME)]]></literallayout> 778 VALUE = (DEF | "inherit" | CHILD-CONTEXT-NAME)]]></literallayout>
778 </refsect1> 779 </refsect1>
779 780
780 <refsect1 id='sample.5'> 781 <refsect1 id='sample.5'>
781 <title>Sample</title> 782 <title>Sample</title>
782 <literallayout class="monospaced"><![CDATA[ 783 <literallayout class="monospaced"><![CDATA[
833 dnsbl_list local sbl; 834 dnsbl_list local sbl;
834 dnswl_list dnswl.org; 835 dnswl_list dnswl.org;
835 require_rdns yes; 836 require_rdns yes;
836 837
837 content on { 838 content on {
839 dkim_signer {
840 credit.paypal.com require_signed credit.paypal.com;
841 paypal.com require_signed paypal.com;
842 dhl.com require_signed dhl.com;
843 adp.com require_signed "adp.com,bmi.adp.com";
844 };
845 dkim_from {
846 accounts.google.com white;
847 };
838 filter sbl-xbl.spamhaus.org "Mail containing %s rejected - sbl; see http://www.spamhaus.org/query/bl?ip=%s"; 848 filter sbl-xbl.spamhaus.org "Mail containing %s rejected - sbl; see http://www.spamhaus.org/query/bl?ip=%s";
839 uribl multi.surbl.org "Mail containing %s rejected - surbl; see http://www.surbl.org/surbl-analysis?d=%s"; 849 uribl multi.surbl.org "Mail containing %s rejected - surbl; see http://www.surbl.org/surbl-analysis?d=%s";
840 #uribl multi.uribl.com "Mail containing %s rejected - uribl; see http://l.uribl.com/?d=%s"; 850 #uribl multi.uribl.com "Mail containing %s rejected - uribl; see http://l.uribl.com/?d=%s";
841 #uribl dbl.spamhaus.org "Mail containing %s rejected - dbl; see http://www.spamhaus.org/query/domain?domain=%s"; 851 #uribl dbl.spamhaus.org "Mail containing %s rejected - dbl; see http://www.spamhaus.org/query/domain?domain=%s";
842 ignore { include "hosts-ignore.conf"; }; 852 ignore { include "hosts-ignore.conf"; };