diff options
Diffstat (limited to 'gnu/usr.sbin/sendmail/cf/feature')
21 files changed, 113 insertions, 65 deletions
diff --git a/gnu/usr.sbin/sendmail/cf/feature/access_db.m4 b/gnu/usr.sbin/sendmail/cf/feature/access_db.m4 index 9e13f9c59cb..de078d94707 100644 --- a/gnu/usr.sbin/sendmail/cf/feature/access_db.m4 +++ b/gnu/usr.sbin/sendmail/cf/feature/access_db.m4 @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers. # All rights reserved. # # By using this file, you agree to the terms and conditions set @@ -10,14 +10,28 @@ divert(-1) # divert(0) -VERSIONID(`$Sendmail: access_db.m4,v 8.15 1999/07/22 17:55:34 gshapiro Exp $') +VERSIONID(`$Sendmail: access_db.m4,v 8.23 2001/03/16 00:51:25 gshapiro 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(_ARG3_),`skip',`define(`_ACCESS_SKIP_', `1')') +ifelse(lower(_ARG3_),`lookupdotdomain',`define(`_LOOKUPDOTDOMAIN_', `1')') +define(`_ATMPF_', `<TMPF>')dnl +dnl check whether arg contains -T`'_ATMPF_ +ifelse(defn(`_ARG_'), `', `', + defn(`_ARG_'), `LDAP', `', + `ifelse(index(_ARG_, _ATMPF_), `-1', + `errprint(`*** WARNING: missing -T'_ATMPF_` in argument of FEATURE(`access_db',' defn(`_ARG_')`) +') + define(`_ABP_', index(_ARG_, ` ')) + define(`_NARG_', `substr(_ARG_, 0, _ABP_) -T'_ATMPF_` substr(_ARG_, _ABP_)') +')') LOCAL_CONFIG # Access list database (for spam stomping) -Kaccess ifelse(defn(`_ARG_'), `', - DATABASE_MAP_TYPE MAIL_SETTINGS_DIR`access', - `_ARG_') +Kaccess ifelse(defn(`_ARG_'), `', DATABASE_MAP_TYPE -T`'_ATMPF_ MAIL_SETTINGS_DIR`access', + defn(`_ARG_'), `LDAP', `ldap -T`'_ATMPF_ -1 -v sendmailMTAMapValue -k (&(objectClass=sendmailMTAMapObject)(|(sendmailMTACluster=${sendmailMTACluster})(sendmailMTAHost=$j))(sendmailMTAMapName=access)(sendmailMTAKey=%0))', + defn(`_NARG_'), `', `_ARG_', `_NARG_') diff --git a/gnu/usr.sbin/sendmail/cf/feature/allmasquerade.m4 b/gnu/usr.sbin/sendmail/cf/feature/allmasquerade.m4 index 731d7b5fc41..1a6819331d5 100644 --- a/gnu/usr.sbin/sendmail/cf/feature/allmasquerade.m4 +++ b/gnu/usr.sbin/sendmail/cf/feature/allmasquerade.m4 @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers. # All rights reserved. # Copyright (c) 1983 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 @@ -13,7 +13,13 @@ divert(-1) # divert(0) -VERSIONID(`$Sendmail: allmasquerade.m4,v 8.11 1999/08/06 01:28:26 gshapiro Exp $') +VERSIONID(`$Sendmail: allmasquerade.m4,v 8.13 2000/09/12 22:00:53 ca Exp $') divert(-1) +ifdef(`_MAILER_local_', + `errprint(`*** MAILER(`local') must appear after FEATURE(`allmasquerade')') +')dnl +ifdef(`_MAILER_uucp_', + `errprint(`*** MAILER(`uucp') must appear after FEATURE(`allmasquerade')') +')dnl define(`_ALL_MASQUERADE_', 1) diff --git a/gnu/usr.sbin/sendmail/cf/feature/always_add_domain.m4 b/gnu/usr.sbin/sendmail/cf/feature/always_add_domain.m4 index c7c6ebfcc42..f899347bd67 100644 --- a/gnu/usr.sbin/sendmail/cf/feature/always_add_domain.m4 +++ b/gnu/usr.sbin/sendmail/cf/feature/always_add_domain.m4 @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers. # All rights reserved. # Copyright (c) 1983 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 @@ -13,7 +13,10 @@ divert(-1) # divert(0) -VERSIONID(`$Sendmail: always_add_domain.m4,v 8.9 1999/02/07 07:26:08 gshapiro Exp $') +VERSIONID(`$Sendmail: always_add_domain.m4,v 8.11 2000/09/12 22:00:53 ca Exp $') divert(-1) -define(`_ALWAYS_ADD_DOMAIN_', 1) +ifdef(`_MAILER_local_', + `errprint(`*** MAILER(`local') must appear after FEATURE(`always_add_domain')') +')dnl +define(`_ALWAYS_ADD_DOMAIN_', ifelse(len(X`'_ARG_),`1',`',_ARG_)) diff --git a/gnu/usr.sbin/sendmail/cf/feature/bestmx_is_local.m4 b/gnu/usr.sbin/sendmail/cf/feature/bestmx_is_local.m4 index b8065ddccfb..7938d9d8b41 100644 --- a/gnu/usr.sbin/sendmail/cf/feature/bestmx_is_local.m4 +++ b/gnu/usr.sbin/sendmail/cf/feature/bestmx_is_local.m4 @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers. # All rights reserved. # Copyright (c) 1983 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 @@ -13,10 +13,10 @@ divert(-1) # divert(0) -VERSIONID(`$Sendmail: bestmx_is_local.m4,v 8.24 1999/10/18 21:50:24 ca Exp $') +VERSIONID(`$Sendmail: bestmx_is_local.m4,v 8.26 2000/09/17 17:30:00 gshapiro Exp $') divert(-1) -define(_BESTMX_IS_LOCAL_, _ARG_) +define(`_BESTMX_IS_LOCAL_', _ARG_) LOCAL_CONFIG # turn on bestMX lookup table diff --git a/gnu/usr.sbin/sendmail/cf/feature/bitdomain.m4 b/gnu/usr.sbin/sendmail/cf/feature/bitdomain.m4 index d6423dd5470..57bada72479 100644 --- a/gnu/usr.sbin/sendmail/cf/feature/bitdomain.m4 +++ b/gnu/usr.sbin/sendmail/cf/feature/bitdomain.m4 @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# Copyright (c) 1998, 1999, 2001 Sendmail, Inc. and its suppliers. # All rights reserved. # Copyright (c) 1983 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 @@ -13,13 +13,13 @@ divert(-1) # divert(0) -VERSIONID(`$Sendmail: bitdomain.m4,v 8.23 1999/07/22 17:55:34 gshapiro Exp $') +VERSIONID(`$Sendmail: bitdomain.m4,v 8.28 2001/03/16 00:51:25 gshapiro Exp $') divert(-1) define(`_BITDOMAIN_TABLE_', `') LOCAL_CONFIG # BITNET mapping table -Kbitdomain ifelse(defn(`_ARG_'), `', - DATABASE_MAP_TYPE MAIL_SETTINGS_DIR`bitdomain', +Kbitdomain ifelse(defn(`_ARG_'), `', DATABASE_MAP_TYPE MAIL_SETTINGS_DIR`bitdomain', + defn(`_ARG_'), `LDAP', `ldap -1 -v sendmailMTAMapValue -k (&(objectClass=sendmailMTAMapObject)(|(sendmailMTACluster=${sendmailMTACluster})(sendmailMTAHost=$j))(sendmailMTAMapName=bitdomain)(sendmailMTAKey=%0))', `_ARG_') diff --git a/gnu/usr.sbin/sendmail/cf/feature/delay_checks.m4 b/gnu/usr.sbin/sendmail/cf/feature/delay_checks.m4 index be92bcd6665..0791f488137 100644 --- a/gnu/usr.sbin/sendmail/cf/feature/delay_checks.m4 +++ b/gnu/usr.sbin/sendmail/cf/feature/delay_checks.m4 @@ -10,7 +10,7 @@ divert(-1) # divert(0) -VERSIONID(`$Sendmail: delay_checks.m4,v 8.7 2000/02/26 01:32:02 gshapiro Exp $') +VERSIONID(`$Sendmail: delay_checks.m4,v 8.8 2000/12/05 18:50:45 ca Exp $') divert(-1) define(`_DELAY_CHECKS_', 1) @@ -20,3 +20,6 @@ ifelse(defn(`_ARG_'), `', `', `errprint(`*** ERROR: illegal argument _ARG_ for FEATURE(delay_checks) ') ') + +dnl be backward compatible by default +ifelse(len(X`'_ARG2_), `1', `define(`_DELAY_COMPAT_8_10_', 1)', `') diff --git a/gnu/usr.sbin/sendmail/cf/feature/dnsbl.m4 b/gnu/usr.sbin/sendmail/cf/feature/dnsbl.m4 index 4c595e98f5c..a66f47ed8cb 100644 --- a/gnu/usr.sbin/sendmail/cf/feature/dnsbl.m4 +++ b/gnu/usr.sbin/sendmail/cf/feature/dnsbl.m4 @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers. # All rights reserved. # # By using this file, you agree to the terms and conditions set @@ -11,15 +11,22 @@ divert(-1) divert(0) ifdef(`_DNSBL_R_',`dnl',`dnl -VERSIONID(`$Sendmail: dnsbl.m4,v 8.18.16.1 2000/11/22 01:13:21 ca Exp $')') +VERSIONID(`$Sendmail: dnsbl.m4,v 8.24 2001/03/29 20:48:45 gshapiro Exp $') +define(`_DNSBL_R_',`') +LOCAL_CONFIG +# map for DNS based blacklist lookups +Kdnsbl host -T<TMP>') divert(-1) define(`_DNSBL_SRV_', `ifelse(len(X`'_ARG_),`1',`blackholes.mail-abuse.org',_ARG_)')dnl define(`_DNSBL_MSG_', `ifelse(len(X`'_ARG2_),`1',`"550 Mail from " $`'&{client_addr} " refused by blackhole site '_DNSBL_SRV_`"',`_ARG2_')')dnl +define(`_DNSBL_MSG_TMP_', `ifelse(_ARG3_,`t',`"451 Temporary lookup failure of " $`'&{client_addr} " at '_DNSBL_SRV_`"',`_ARG2_')')dnl divert(8) # DNS based IP address spam list _DNSBL_SRV_ R$* $: $&{client_addr} -R::ffff:$-.$-.$-.$- $: <?> $(host $4.$3.$2.$1._DNSBL_SRV_. $: OK $) -R$-.$-.$-.$- $: <?> $(host $4.$3.$2.$1._DNSBL_SRV_. $: OK $) +R$-.$-.$-.$- $: <?> $(dnsbl $4.$3.$2.$1._DNSBL_SRV_. $: OK $) R<?>OK $: OKSOFAR +ifelse(len(X`'_ARG3_),`1', +`R<?>$+<TMP> $: TMPOK', +`R<?>$+<TMP> $#error $@ 4.7.1 $: _DNSBL_MSG_TMP_') R<?>$+ $#error $@ 5.7.1 $: _DNSBL_MSG_ divert(-1) diff --git a/gnu/usr.sbin/sendmail/cf/feature/domaintable.m4 b/gnu/usr.sbin/sendmail/cf/feature/domaintable.m4 index 5542e315f29..c2a27a493ca 100644 --- a/gnu/usr.sbin/sendmail/cf/feature/domaintable.m4 +++ b/gnu/usr.sbin/sendmail/cf/feature/domaintable.m4 @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# Copyright (c) 1998, 1999, 2001 Sendmail, Inc. and its suppliers. # All rights reserved. # Copyright (c) 1983 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 @@ -13,13 +13,13 @@ divert(-1) # divert(0) -VERSIONID(`$Sendmail: domaintable.m4,v 8.17 1999/07/22 17:55:35 gshapiro Exp $') +VERSIONID(`$Sendmail: domaintable.m4,v 8.22 2001/03/16 00:51:25 gshapiro Exp $') divert(-1) define(`_DOMAIN_TABLE_', `') LOCAL_CONFIG # Domain table (adding domains) -Kdomaintable ifelse(defn(`_ARG_'), `', - DATABASE_MAP_TYPE MAIL_SETTINGS_DIR`domaintable', +Kdomaintable ifelse(defn(`_ARG_'), `', DATABASE_MAP_TYPE MAIL_SETTINGS_DIR`domaintable', + defn(`_ARG_'), `LDAP', `ldap -1 -v sendmailMTAMapValue -k (&(objectClass=sendmailMTAMapObject)(|(sendmailMTACluster=${sendmailMTACluster})(sendmailMTAHost=$j))(sendmailMTAMapName=domain)(sendmailMTAKey=%0))', `_ARG_') diff --git a/gnu/usr.sbin/sendmail/cf/feature/genericstable.m4 b/gnu/usr.sbin/sendmail/cf/feature/genericstable.m4 index f03a7af8530..72b6790c1a8 100644 --- a/gnu/usr.sbin/sendmail/cf/feature/genericstable.m4 +++ b/gnu/usr.sbin/sendmail/cf/feature/genericstable.m4 @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# Copyright (c) 1998, 1999, 2001 Sendmail, Inc. and its suppliers. # All rights reserved. # Copyright (c) 1983 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 @@ -13,13 +13,13 @@ divert(-1) # divert(0) -VERSIONID(`$Sendmail: genericstable.m4,v 8.16 1999/07/22 17:55:35 gshapiro Exp $') +VERSIONID(`$Sendmail: genericstable.m4,v 8.21 2001/03/16 00:51:26 gshapiro Exp $') divert(-1) define(`_GENERICS_TABLE_', `') LOCAL_CONFIG # Generics table (mapping outgoing addresses) -Kgenerics ifelse(defn(`_ARG_'), `', - DATABASE_MAP_TYPE MAIL_SETTINGS_DIR`genericstable', +Kgenerics ifelse(defn(`_ARG_'), `', DATABASE_MAP_TYPE MAIL_SETTINGS_DIR`genericstable', + defn(`_ARG_'), `LDAP', `ldap -1 -v sendmailMTAMapValue -k (&(objectClass=sendmailMTAMapObject)(|(sendmailMTACluster=${sendmailMTACluster})(sendmailMTAHost=$j))(sendmailMTAMapName=generics)(sendmailMTAKey=%0))', `_ARG_') diff --git a/gnu/usr.sbin/sendmail/cf/feature/ldap_routing.m4 b/gnu/usr.sbin/sendmail/cf/feature/ldap_routing.m4 index 4f2e7799fa4..677ce67d8c5 100644 --- a/gnu/usr.sbin/sendmail/cf/feature/ldap_routing.m4 +++ b/gnu/usr.sbin/sendmail/cf/feature/ldap_routing.m4 @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 1999-2000 Sendmail, Inc. and its suppliers. +# Copyright (c) 1999-2001 Sendmail, Inc. and its suppliers. # All rights reserved. # # By using this file, you agree to the terms and conditions set @@ -10,7 +10,7 @@ divert(-1) # divert(0) -VERSIONID(`$Sendmail: ldap_routing.m4,v 8.5.4.1 2000/07/15 18:05:05 gshapiro Exp $') +VERSIONID(`$Sendmail: ldap_routing.m4,v 8.8 2001/06/27 21:46:31 gshapiro Exp $') divert(-1) # Check first two arguments. If they aren't set, may need to warn in proto.m4 @@ -23,6 +23,11 @@ ifelse(len(X`'_ARG3_), `1', `define(`_LDAP_ROUTING_', `_PASS_THROUGH_')', _ARG3_, `passthru', `define(`_LDAP_ROUTING_', `_PASS_THROUGH_')', `define(`_LDAP_ROUTING_', `_MUST_EXIST_')') +# Check for fouth argument to indicate how to deal with +detail info +ifelse(len(X`'_ARG4_), `1', `', + _ARG4_, `strip', `define(`_LDAP_ROUTE_DETAIL_', `_STRIP_')', + _ARG4_, `preserve', `define(`_LDAP_ROUTE_DETAIL_', `_PRESERVE_')') + LOCAL_CONFIG # LDAP routing maps Kldapmh ifelse(len(X`'_ARG1_), `1', diff --git a/gnu/usr.sbin/sendmail/cf/feature/local_lmtp.m4 b/gnu/usr.sbin/sendmail/cf/feature/local_lmtp.m4 index f680970fd3b..b7d74fa843a 100644 --- a/gnu/usr.sbin/sendmail/cf/feature/local_lmtp.m4 +++ b/gnu/usr.sbin/sendmail/cf/feature/local_lmtp.m4 @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# Copyright (c) 1998-2000 Sendmail, Inc. and its suppliers. # All rights reserved. # # By using this file, you agree to the terms and conditions set @@ -10,7 +10,7 @@ divert(-1) # divert(0) -VERSIONID(`$Sendmail: local_lmtp.m4,v 8.15 1999/11/18 05:06:22 ca Exp $') +VERSIONID(`$Sendmail: local_lmtp.m4,v 8.16 2000/08/18 18:58:45 ca Exp $') divert(-1) ifdef(`_MAILER_local_', @@ -24,3 +24,4 @@ define(`LOCAL_MAILER_PATH', define(`LOCAL_MAILER_FLAGS', `PSXfmnz9') define(`LOCAL_MAILER_ARGS', `mail.local -l') define(`LOCAL_MAILER_DSN_DIAGNOSTIC_CODE', `SMTP') +define(`_LOCAL_LMTP_', `1') diff --git a/gnu/usr.sbin/sendmail/cf/feature/mailertable.m4 b/gnu/usr.sbin/sendmail/cf/feature/mailertable.m4 index ad6088e0d66..b425860cc2e 100644 --- a/gnu/usr.sbin/sendmail/cf/feature/mailertable.m4 +++ b/gnu/usr.sbin/sendmail/cf/feature/mailertable.m4 @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# Copyright (c) 1998, 1999, 2001 Sendmail, Inc. and its suppliers. # All rights reserved. # Copyright (c) 1983 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 @@ -13,13 +13,13 @@ divert(-1) # divert(0) -VERSIONID(`$Sendmail: mailertable.m4,v 8.18 1999/07/22 17:55:35 gshapiro Exp $') +VERSIONID(`$Sendmail: mailertable.m4,v 8.23 2001/03/16 00:51:26 gshapiro Exp $') divert(-1) define(`_MAILER_TABLE_', `') LOCAL_CONFIG # Mailer table (overriding domains) -Kmailertable ifelse(defn(`_ARG_'), `', - DATABASE_MAP_TYPE MAIL_SETTINGS_DIR`mailertable', +Kmailertable ifelse(defn(`_ARG_'), `', DATABASE_MAP_TYPE MAIL_SETTINGS_DIR`mailertable', + defn(`_ARG_'), `LDAP', `ldap -1 -v sendmailMTAMapValue -k (&(objectClass=sendmailMTAMapObject)(|(sendmailMTACluster=${sendmailMTACluster})(sendmailMTAHost=$j))(sendmailMTAMapName=mailer)(sendmailMTAKey=%0))', `_ARG_') diff --git a/gnu/usr.sbin/sendmail/cf/feature/no_default_msa.m4 b/gnu/usr.sbin/sendmail/cf/feature/no_default_msa.m4 index 52a18653f21..11aa676aa92 100644 --- a/gnu/usr.sbin/sendmail/cf/feature/no_default_msa.m4 +++ b/gnu/usr.sbin/sendmail/cf/feature/no_default_msa.m4 @@ -10,7 +10,7 @@ divert(-1) # divert(0) -VERSIONID(`$Sendmail: no_default_msa.m4,v 8.1.10.1 2000/09/17 17:04:22 gshapiro Exp $') +VERSIONID(`$Sendmail: no_default_msa.m4,v 8.2 2001/02/14 05:03:22 gshapiro Exp $') divert(-1) define(`_NO_MSA_', `1') diff --git a/gnu/usr.sbin/sendmail/cf/feature/nullclient.m4 b/gnu/usr.sbin/sendmail/cf/feature/nullclient.m4 index 568774bfb18..656c6b7f193 100644 --- a/gnu/usr.sbin/sendmail/cf/feature/nullclient.m4 +++ b/gnu/usr.sbin/sendmail/cf/feature/nullclient.m4 @@ -22,7 +22,7 @@ ifelse(defn(`_ARG_'), `', `errprint(`Feature "nullclient" requires argument')', # divert(0) -VERSIONID(`$Sendmail: nullclient.m4,v 8.21.16.3 2000/09/17 17:04:22 gshapiro Exp $') +VERSIONID(`$Sendmail: nullclient.m4,v 8.24 2000/09/17 17:30:00 gshapiro Exp $') divert(-1) undefine(`ALIAS_FILE') diff --git a/gnu/usr.sbin/sendmail/cf/feature/promiscuous_relay.m4 b/gnu/usr.sbin/sendmail/cf/feature/promiscuous_relay.m4 index 8aac82e1965..4d9d711b9cf 100644 --- a/gnu/usr.sbin/sendmail/cf/feature/promiscuous_relay.m4 +++ b/gnu/usr.sbin/sendmail/cf/feature/promiscuous_relay.m4 @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# Copyright (c) 1998-1999, 2001 Sendmail, Inc. and its suppliers. # All rights reserved. # # By using this file, you agree to the terms and conditions set @@ -10,7 +10,10 @@ divert(-1) # divert(0) -VERSIONID(`$Sendmail: promiscuous_relay.m4,v 8.10 1999/02/07 07:26:11 gshapiro Exp $') +VERSIONID(`$Sendmail: promiscuous_relay.m4,v 8.12 2001/02/06 17:14:35 ca Exp $') divert(-1) define(`_PROMISCUOUS_RELAY_', 1) +errprint(`*** WARNING: FEATURE(`promiscuous_relay') configures your system as open + relay. Do NOT use it on a server that is connected to the Internet! +') diff --git a/gnu/usr.sbin/sendmail/cf/feature/relay_local_from.m4 b/gnu/usr.sbin/sendmail/cf/feature/relay_local_from.m4 index 8be79252014..d793976c9eb 100644 --- a/gnu/usr.sbin/sendmail/cf/feature/relay_local_from.m4 +++ b/gnu/usr.sbin/sendmail/cf/feature/relay_local_from.m4 @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# Copyright (c) 1998-1999, 2001 Sendmail, Inc. and its suppliers. # All rights reserved. # # By using this file, you agree to the terms and conditions set @@ -10,7 +10,11 @@ divert(-1) # divert(0) -VERSIONID(`$Sendmail: relay_local_from.m4,v 8.5 1999/02/07 07:26:12 gshapiro Exp $') +VERSIONID(`$Sendmail: relay_local_from.m4,v 8.6 2001/02/06 15:55:21 ca Exp $') divert(-1) define(`_RELAY_LOCAL_FROM_', 1) +errprint(`*** WARNING: FEATURE(`relay_local_from') may cause your system to act as open + relay. Use SMTP AUTH or STARTTLS instead. If you cannot use those, + try FEATURE(`relay_mail_from'). +') diff --git a/gnu/usr.sbin/sendmail/cf/feature/relay_mail_from.m4 b/gnu/usr.sbin/sendmail/cf/feature/relay_mail_from.m4 index e65890c1c44..fc134746a1f 100644 --- a/gnu/usr.sbin/sendmail/cf/feature/relay_mail_from.m4 +++ b/gnu/usr.sbin/sendmail/cf/feature/relay_mail_from.m4 @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 1999 Sendmail, Inc. and its suppliers. +# Copyright (c) 1999, 2001 Sendmail, Inc. and its suppliers. # All rights reserved. # # By using this file, you agree to the terms and conditions set @@ -10,11 +10,14 @@ divert(-1) # divert(0) -VERSIONID(`$Sendmail: relay_mail_from.m4,v 8.2 1999/04/02 02:25:13 gshapiro Exp $') +VERSIONID(`$Sendmail: relay_mail_from.m4,v 8.3 2001/02/06 16:07:12 ca Exp $') divert(-1) ifdef(`_ACCESS_TABLE_', `define(`_RELAY_DB_FROM_', 1) ifelse(_ARG_,`domain',`define(`_RELAY_DB_FROM_DOMAIN_', 1)')', - `errprint(`*** ERROR: FEATURE(relay_mail_from) requires FEATURE(access_db) + `errprint(`*** ERROR: FEATURE(`relay_mail_from') requires FEATURE(`access_db') ')') +errprint(`*** WARNING: FEATURE(`relay_mail_from') may cause your system to act as open + relay. Use SMTP AUTH or STARTTLS instead. +') diff --git a/gnu/usr.sbin/sendmail/cf/feature/use_ct_file.m4 b/gnu/usr.sbin/sendmail/cf/feature/use_ct_file.m4 index db6c308e6ab..c010fdf655b 100644 --- a/gnu/usr.sbin/sendmail/cf/feature/use_ct_file.m4 +++ b/gnu/usr.sbin/sendmail/cf/feature/use_ct_file.m4 @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# Copyright (c) 1998, 1999, 2001 Sendmail, Inc. and its suppliers. # All rights reserved. # Copyright (c) 1983 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 @@ -13,12 +13,11 @@ divert(-1) # divert(0) -VERSIONID(`$Sendmail: use_ct_file.m4,v 8.9 1999/02/07 07:26:13 gshapiro Exp $') +VERSIONID(`$Sendmail: use_ct_file.m4,v 8.11 2001/08/26 20:58:57 gshapiro Exp $') divert(-1) -# if defined, the sendmail.cf will read the /etc/sendmail.ct file -# to find the names of trusted users. There should only be a few -# of these, and normally this is done directly in the .cf file. +# if defined, the sendmail.cf will read the /etc/mail/trusted-users file to +# find the names of trusted users. There should only be a few of these. define(`_USE_CT_FILE_', `') diff --git a/gnu/usr.sbin/sendmail/cf/feature/use_cw_file.m4 b/gnu/usr.sbin/sendmail/cf/feature/use_cw_file.m4 index bad558f352e..15e77707cef 100644 --- a/gnu/usr.sbin/sendmail/cf/feature/use_cw_file.m4 +++ b/gnu/usr.sbin/sendmail/cf/feature/use_cw_file.m4 @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# Copyright (c) 1998, 1999, 2001 Sendmail, Inc. and its suppliers. # All rights reserved. # Copyright (c) 1983 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 @@ -13,12 +13,12 @@ divert(-1) # divert(0) -VERSIONID(`$Sendmail: use_cw_file.m4,v 8.9 1999/02/07 07:26:13 gshapiro Exp $') +VERSIONID(`$Sendmail: use_cw_file.m4,v 8.11 2001/08/26 20:58:57 gshapiro Exp $') divert(-1) -# if defined, the sendmail.cf will read the /etc/sendmail.cw file -# to find alternate names for this host. Typically only used when -# several hosts have been squashed into one another at high speed. +# if defined, the sendmail.cf will read the /etc/mail/local-host-names file +# to find alternate names for this host. Typically only used when several +# hosts have been squashed into one another at high speed. define(`USE_CW_FILE', `') diff --git a/gnu/usr.sbin/sendmail/cf/feature/uucpdomain.m4 b/gnu/usr.sbin/sendmail/cf/feature/uucpdomain.m4 index 0f7f78b99f2..88e975d58ae 100644 --- a/gnu/usr.sbin/sendmail/cf/feature/uucpdomain.m4 +++ b/gnu/usr.sbin/sendmail/cf/feature/uucpdomain.m4 @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# Copyright (c) 1998, 1999, 2001 Sendmail, Inc. and its suppliers. # All rights reserved. # Copyright (c) 1983 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 @@ -13,13 +13,13 @@ divert(-1) # divert(0) -VERSIONID(`$Sendmail: uucpdomain.m4,v 8.22 1999/07/22 17:55:35 gshapiro Exp $') +VERSIONID(`$Sendmail: uucpdomain.m4,v 8.27 2001/03/16 00:51:26 gshapiro Exp $') divert(-1) define(`_UUDOMAIN_TABLE_', `') LOCAL_CONFIG # UUCP domain table -Kuudomain ifelse(defn(`_ARG_'), `', - DATABASE_MAP_TYPE MAIL_SETTINGS_DIR`uudomain', +Kuudomain ifelse(defn(`_ARG_'), `', DATABASE_MAP_TYPE MAIL_SETTINGS_DIR`uudomain', + defn(`_ARG_'), `LDAP', `ldap -1 -v sendmailMTAMapValue -k (&(objectClass=sendmailMTAMapObject)(|(sendmailMTACluster=${sendmailMTACluster})(sendmailMTAHost=$j))(sendmailMTAMapName=uucpdomain)(sendmailMTAKey=%0))', `_ARG_') diff --git a/gnu/usr.sbin/sendmail/cf/feature/virtusertable.m4 b/gnu/usr.sbin/sendmail/cf/feature/virtusertable.m4 index 1210ee98285..608cb33f789 100644 --- a/gnu/usr.sbin/sendmail/cf/feature/virtusertable.m4 +++ b/gnu/usr.sbin/sendmail/cf/feature/virtusertable.m4 @@ -1,6 +1,6 @@ divert(-1) # -# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# Copyright (c) 1998, 1999, 2001 Sendmail, Inc. and its suppliers. # All rights reserved. # Copyright (c) 1983 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 @@ -13,13 +13,13 @@ divert(-1) # divert(0) -VERSIONID(`$Sendmail: virtusertable.m4,v 8.16 1999/07/22 17:55:36 gshapiro Exp $') +VERSIONID(`$Sendmail: virtusertable.m4,v 8.21 2001/03/16 00:51:26 gshapiro Exp $') divert(-1) define(`_VIRTUSER_TABLE_', `') LOCAL_CONFIG # Virtual user table (maps incoming users) -Kvirtuser ifelse(defn(`_ARG_'), `', - DATABASE_MAP_TYPE MAIL_SETTINGS_DIR`virtusertable', +Kvirtuser ifelse(defn(`_ARG_'), `', DATABASE_MAP_TYPE MAIL_SETTINGS_DIR`virtusertable', + defn(`_ARG_'), `LDAP', `ldap -1 -v sendmailMTAMapValue -k (&(objectClass=sendmailMTAMapObject)(|(sendmailMTACluster=${sendmailMTACluster})(sendmailMTAHost=$j))(sendmailMTAMapName=virtuser)(sendmailMTAKey=%0))', `_ARG_') |