diff options
Diffstat (limited to 'contrib/sendmail/cf/feature')
-rw-r--r-- | contrib/sendmail/cf/feature/access_db.m4 | 9 | ||||
-rw-r--r-- | contrib/sendmail/cf/feature/badmx.m4 | 22 | ||||
-rw-r--r-- | contrib/sendmail/cf/feature/block_bad_helo.m4 | 18 | ||||
-rw-r--r-- | contrib/sendmail/cf/feature/dnsbl.m4 | 10 | ||||
-rw-r--r-- | contrib/sendmail/cf/feature/enhdnsbl.m4 | 25 | ||||
-rw-r--r-- | contrib/sendmail/cf/feature/require_rdns.m4 | 16 |
6 files changed, 86 insertions, 14 deletions
diff --git a/contrib/sendmail/cf/feature/access_db.m4 b/contrib/sendmail/cf/feature/access_db.m4 index 5488a45..8aa90c8 100644 --- a/contrib/sendmail/cf/feature/access_db.m4 +++ b/contrib/sendmail/cf/feature/access_db.m4 @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 1998-2002, 2004 Sendmail, Inc. and its suppliers. +# Copyright (c) 1998-2002, 2004, 2006 Sendmail, Inc. and its suppliers. # All rights reserved. # # By using this file, you agree to the terms and conditions set @@ -10,15 +10,20 @@ divert(-1) # divert(0) -VERSIONID(`$Id: access_db.m4,v 8.26 2004/06/24 18:10:02 ca Exp $') +VERSIONID(`$Id: access_db.m4,v 8.27 2006/07/06 21:10:10 ca Exp $') divert(-1) define(`_ACCESS_TABLE_', `') define(`_TAG_DELIM_', `:')dnl should be in OperatorChars ifelse(lower(_ARG2_),`skip',`define(`_ACCESS_SKIP_', `1')') ifelse(lower(_ARG2_),`lookupdotdomain',`define(`_LOOKUPDOTDOMAIN_', `1')') +ifelse(lower(_ARG2_),`relaytofulladdress',`define(`_RELAY_FULL_ADDR_', `1')') ifelse(lower(_ARG3_),`skip',`define(`_ACCESS_SKIP_', `1')') ifelse(lower(_ARG3_),`lookupdotdomain',`define(`_LOOKUPDOTDOMAIN_', `1')') +ifelse(lower(_ARG3_),`relaytofulladdress',`define(`_RELAY_FULL_ADDR_', `1')') +ifelse(lower(_ARG4_),`skip',`define(`_ACCESS_SKIP_', `1')') +ifelse(lower(_ARG4_),`lookupdotdomain',`define(`_LOOKUPDOTDOMAIN_', `1')') +ifelse(lower(_ARG4_),`relaytofulladdress',`define(`_RELAY_FULL_ADDR_', `1')') define(`_ATMPF_', `<TMPF>')dnl dnl check whether arg contains -T`'_ATMPF_ dnl unless it is a sequence map diff --git a/contrib/sendmail/cf/feature/badmx.m4 b/contrib/sendmail/cf/feature/badmx.m4 new file mode 100644 index 0000000..dc0dc88 --- /dev/null +++ b/contrib/sendmail/cf/feature/badmx.m4 @@ -0,0 +1,22 @@ +divert(-1) +# +# Copyright (c) 2006 Sendmail, Inc. and its suppliers. +# All rights reserved. +# +# By using this file, you agree to the terms and conditions set +# forth in the LICENSE file which can be found at the top level of +# the sendmail distribution. +# +# + +divert(0) +VERSIONID(`$Id: badmx.m4,v 1.1 2006/12/16 00:56:32 ca Exp $') +divert(-1) + +define(`_BADMX_CHK_', 1) + +LOCAL_CONFIG +Kmxlist bestmx -z: -T<TEMP> +Kbadmx regex -a<BADMX> ^(([0-9]{1,3}\.){3}[0-9]){0,1}\.$ +KdnsA dns -R A -a. -T<TEMP> +KBadMXIP regex -a<BADMXIP> ifelse(defn(`_ARG_'), `', `^(127\.|10\.|0\.0\.0\.0)', `_ARG_') diff --git a/contrib/sendmail/cf/feature/block_bad_helo.m4 b/contrib/sendmail/cf/feature/block_bad_helo.m4 new file mode 100644 index 0000000..6f6d792 --- /dev/null +++ b/contrib/sendmail/cf/feature/block_bad_helo.m4 @@ -0,0 +1,18 @@ +divert(-1) +# +# Copyright (c) 2006 Sendmail, Inc. and its suppliers. +# All rights reserved. +# +# By using this file, you agree to the terms and conditions set +# forth in the LICENSE file which can be found at the top level of +# the sendmail distribution. +# +# + +divert(0)dnl +VERSIONID(`$Id: block_bad_helo.m4,v 1.1 2006/06/15 22:49:30 ca Exp $') +divert(-1) + +define(`_BLOCK_BAD_HELO_', `')dnl +RELAY_DOMAIN(`127.0.0.1')dnl +LOCAL_DOMAIN(`[127.0.0.1]')dnl diff --git a/contrib/sendmail/cf/feature/dnsbl.m4 b/contrib/sendmail/cf/feature/dnsbl.m4 index ffaa88c..be0e2be 100644 --- a/contrib/sendmail/cf/feature/dnsbl.m4 +++ b/contrib/sendmail/cf/feature/dnsbl.m4 @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 1998-2002, 2005, 2006 Sendmail, Inc. and its suppliers. +# Copyright (c) 1998-2002, 2005-2007 Sendmail, Inc. and its suppliers. # All rights reserved. # # By using this file, you agree to the terms and conditions set @@ -12,7 +12,7 @@ divert(-1) ifdef(`DNSBL_MAP', `', `define(`DNSBL_MAP', `dns -R A')') divert(0) ifdef(`_DNSBL_R_',`dnl',`dnl -VERSIONID(`$Id: dnsbl.m4,v 8.32 2006/03/29 22:50:16 ca Exp $') +VERSIONID(`$Id: dnsbl.m4,v 8.33 2007/01/05 18:49:29 ca Exp $') define(`_DNSBL_R_',`') ifelse(defn(`_ARG_'), `', `errprint(`*** ERROR: missing argument for FEATURE(`dnsbl')')') @@ -31,5 +31,9 @@ R<?>OK $: OKSOFAR ifelse(len(X`'_ARG3_),`1', `R<?>$+<TMP> $: TMPOK', `R<?>$+<TMP> $#error $@ 4.4.3 $: _DNSBL_MSG_TMP_') -R<?>$+ $#error $@ 5.7.1 $: _DNSBL_MSG_ +ifelse(`X'_ARG2_,`Xquarantine', +`R<?>$+ $#error $@ quarantine $: _DNSBL_SRV_', +`X'_ARG2_,`Xdiscard', +`R<?>$+ $#discard $: _DNSBL_SRV_', +`R<?>$+ $#error $@ 5.7.1 $: _DNSBL_MSG_') divert(-1) diff --git a/contrib/sendmail/cf/feature/enhdnsbl.m4 b/contrib/sendmail/cf/feature/enhdnsbl.m4 index 63a4f15..bb467ef 100644 --- a/contrib/sendmail/cf/feature/enhdnsbl.m4 +++ b/contrib/sendmail/cf/feature/enhdnsbl.m4 @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 2000-2002, 2005, 2006 Sendmail, Inc. and its suppliers. +# Copyright (c) 2000-2002, 2005-2007 Sendmail, Inc. and its suppliers. # All rights reserved. # # By using this file, you agree to the terms and conditions set @@ -13,7 +13,7 @@ ifelse(defn(`_ARG_'), `', `errprint(`*** ERROR: missing argument for FEATURE(`enhdnsbl')')') divert(0) ifdef(`_EDNSBL_R_',`dnl',`dnl -VERSIONID(`$Id: enhdnsbl.m4,v 1.11 2006/03/31 19:56:16 ca Exp $') +VERSIONID(`$Id: enhdnsbl.m4,v 1.12 2007/01/08 18:22:05 ca Exp $') LOCAL_CONFIG define(`_EDNSBL_R_',`')dnl # map for enhanced DNS based blacklist lookups @@ -21,9 +21,16 @@ Kednsbl dns -R A -a. -T<TMP> -r`'ifdef(`EDNSBL_TO',`EDNSBL_TO',`5') ') divert(-1) define(`_EDNSBL_SRV_', `_ARG_')dnl -define(`_EDNSBL_MSG_', `ifelse(len(X`'_ARG2_),`1',`"550 Rejected: " $`'&{client_addr} " listed at '_EDNSBL_SRV_`"',`_ARG2_')')dnl +define(`_EDNSBL_MSG_', + `ifelse(len(X`'_ARG2_),`1',`"550 Rejected: " $`'&{client_addr} " listed at '_EDNSBL_SRV_`"', + X`'_ARG2_,`Xquarantine',`_EDNSBL_SRV_', + `_ARG2_')')dnl define(`_EDNSBL_MSG_TMP_', `ifelse(_ARG3_,`t',`"451 Temporary lookup failure of " $`'&{client_addr} " at '_EDNSBL_SRV_`"',`_ARG3_')')dnl define(`_EDNSBL_MATCH_', `ifelse(len(X`'_ARG4_),`1',`$`'+',_ARG4_)')dnl +define(`_EDNSBL_ACTION_', + `ifelse(X`'_ARG2_,`Xquarantine',`$`'#error $`'@ quarantine', + X`'_ARG2_,`Xdiscard',`$`'#discard', + `$`'#error $`'@ 5.7.1')')dnl divert(8) # DNS based IP address spam list _EDNSBL_SRV_ R$* $: $&{client_addr} @@ -32,15 +39,15 @@ R<?>OK $: OKSOFAR ifelse(len(X`'_ARG3_),`1', `R<?>$+<TMP> $: TMPOK', `R<?>$+<TMP> $#error $@ 4.4.3 $: _EDNSBL_MSG_TMP_') -R<?>_EDNSBL_MATCH_ $#error $@ 5.7.1 $: _EDNSBL_MSG_ +R<?>_EDNSBL_MATCH_ _EDNSBL_ACTION_ $: _EDNSBL_MSG_ ifelse(len(X`'_ARG5_),`1',`dnl', -`R<?>_ARG5_ $#error $@ 5.7.1 $: _EDNSBL_MSG_') +`R<?>_ARG5_ _EDNSBL_ACTION_ $: _EDNSBL_MSG_') ifelse(len(X`'_ARG6_),`1',`dnl', -`R<?>_ARG6_ $#error $@ 5.7.1 $: _EDNSBL_MSG_') +`R<?>_ARG6_ _EDNSBL_ACTION_ $: _EDNSBL_MSG_') ifelse(len(X`'_ARG7_),`1',`dnl', -`R<?>_ARG7_ $#error $@ 5.7.1 $: _EDNSBL_MSG_') +`R<?>_ARG7_ _EDNSBL_ACTION_ $: _EDNSBL_MSG_') ifelse(len(X`'_ARG8_),`1',`dnl', -`R<?>_ARG8_ $#error $@ 5.7.1 $: _EDNSBL_MSG_') +`R<?>_ARG8_ _EDNSBL_ACTION_ $: _EDNSBL_MSG_') ifelse(len(X`'_ARG9_),`1',`dnl', -`R<?>_ARG9_ $#error $@ 5.7.1 $: _EDNSBL_MSG_') +`R<?>_ARG9_ _EDNSBL_ACTION_ $: _EDNSBL_MSG_') divert(-1) diff --git a/contrib/sendmail/cf/feature/require_rdns.m4 b/contrib/sendmail/cf/feature/require_rdns.m4 new file mode 100644 index 0000000..4c70d3a --- /dev/null +++ b/contrib/sendmail/cf/feature/require_rdns.m4 @@ -0,0 +1,16 @@ +divert(-1) +# +# Copyright (c) 2006 Sendmail, Inc. and its suppliers. +# All rights reserved. +# +# By using this file, you agree to the terms and conditions set +# forth in the LICENSE file which can be found at the top level of +# the sendmail distribution. +# +# + +divert(0)dnl +VERSIONID(`$Id: require_rdns.m4,v 1.1 2006/06/15 22:49:30 ca Exp $') +divert(-1) + +define(`_REQUIRE_RDNS_', `') |