diff options
Diffstat (limited to 'contrib/sendmail/cf/feature/enhdnsbl.m4')
| -rw-r--r-- | contrib/sendmail/cf/feature/enhdnsbl.m4 | 25 |
1 files changed, 16 insertions, 9 deletions
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) |
