diff options
Diffstat (limited to 'contrib/sendmail/cf/feature')
42 files changed, 370 insertions, 155 deletions
diff --git a/contrib/sendmail/cf/feature/accept_unqualified_senders.m4 b/contrib/sendmail/cf/feature/accept_unqualified_senders.m4 index bf1b1e7..4c39884 100644 --- a/contrib/sendmail/cf/feature/accept_unqualified_senders.m4 +++ b/contrib/sendmail/cf/feature/accept_unqualified_senders.m4 @@ -1,6 +1,7 @@ divert(-1) # -# Copyright (c) 1998 Sendmail, Inc. All rights reserved. +# Copyright (c) 1998, 1999 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 @@ -9,7 +10,7 @@ divert(-1) # divert(0) -VERSIONID(`@(#)accept_unqualified_senders.m4 8.3 (Berkeley) 5/19/1998') +VERSIONID(`$Id: accept_unqualified_senders.m4,v 8.6 1999/02/07 07:26:07 gshapiro Exp $') divert(-1) define(`_ACCEPT_UNQUALIFIED_SENDERS_', 1) diff --git a/contrib/sendmail/cf/feature/accept_unresolvable_domains.m4 b/contrib/sendmail/cf/feature/accept_unresolvable_domains.m4 index cbc4747..a54507c 100644 --- a/contrib/sendmail/cf/feature/accept_unresolvable_domains.m4 +++ b/contrib/sendmail/cf/feature/accept_unresolvable_domains.m4 @@ -1,6 +1,7 @@ divert(-1) # -# Copyright (c) 1998 Sendmail, Inc. All rights reserved. +# Copyright (c) 1998, 1999 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 @@ -9,7 +10,7 @@ divert(-1) # divert(0) -VERSIONID(`@(#)accept_unresolvable_domains.m4 8.7 (Berkeley) 5/19/1998') +VERSIONID(`$Id: accept_unresolvable_domains.m4,v 8.10 1999/02/07 07:26:07 gshapiro Exp $') divert(-1) define(`_ACCEPT_UNRESOLVABLE_DOMAINS_', 1) diff --git a/contrib/sendmail/cf/feature/access_db.m4 b/contrib/sendmail/cf/feature/access_db.m4 index 75b5551..14a8fe8 100644 --- a/contrib/sendmail/cf/feature/access_db.m4 +++ b/contrib/sendmail/cf/feature/access_db.m4 @@ -1,6 +1,7 @@ divert(-1) # -# Copyright (c) 1998 Sendmail, Inc. All rights reserved. +# Copyright (c) 1998, 1999 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 @@ -9,10 +10,14 @@ divert(-1) # divert(0) -VERSIONID(`@(#)access_db.m4 8.8 (Berkeley) 5/19/1998') +VERSIONID(`$Id: access_db.m4,v 8.15 1999/07/22 17:55:34 gshapiro Exp $') divert(-1) -define(`ACCESS_TABLE', - ifelse(_ARG_, `', - DATABASE_MAP_TYPE` -o /etc/mail/access', - `_ARG_'))dnl +define(`_ACCESS_TABLE_', `') +define(`_TAG_DELIM_', `:')dnl should be in OperatorChars + +LOCAL_CONFIG +# Access list database (for spam stomping) +Kaccess ifelse(defn(`_ARG_'), `', + DATABASE_MAP_TYPE MAIL_SETTINGS_DIR`access', + `_ARG_') diff --git a/contrib/sendmail/cf/feature/allmasquerade.m4 b/contrib/sendmail/cf/feature/allmasquerade.m4 index ed622dc..bbb8660 100644 --- a/contrib/sendmail/cf/feature/allmasquerade.m4 +++ b/contrib/sendmail/cf/feature/allmasquerade.m4 @@ -1,6 +1,7 @@ divert(-1) # -# Copyright (c) 1998 Sendmail, Inc. All rights reserved. +# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# All rights reserved. # Copyright (c) 1983 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 # The Regents of the University of California. All rights reserved. @@ -12,8 +13,7 @@ divert(-1) # divert(0) -VERSIONID(`@(#)allmasquerade.m4 8.7 (Berkeley) 5/19/1998') +VERSIONID(`$Id: allmasquerade.m4,v 8.11 1999/08/06 01:28:26 gshapiro Exp $') divert(-1) - define(`_ALL_MASQUERADE_', 1) diff --git a/contrib/sendmail/cf/feature/always_add_domain.m4 b/contrib/sendmail/cf/feature/always_add_domain.m4 index 69092e3..3ea174b 100644 --- a/contrib/sendmail/cf/feature/always_add_domain.m4 +++ b/contrib/sendmail/cf/feature/always_add_domain.m4 @@ -1,6 +1,7 @@ divert(-1) # -# Copyright (c) 1998 Sendmail, Inc. All rights reserved. +# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# All rights reserved. # Copyright (c) 1983 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 # The Regents of the University of California. All rights reserved. @@ -12,7 +13,7 @@ divert(-1) # divert(0) -VERSIONID(`@(#)always_add_domain.m4 8.6 (Berkeley) 5/19/1998') +VERSIONID(`$Id: always_add_domain.m4,v 8.9 1999/02/07 07:26:08 gshapiro Exp $') divert(-1) define(`_ALWAYS_ADD_DOMAIN_', 1) diff --git a/contrib/sendmail/cf/feature/bestmx_is_local.m4 b/contrib/sendmail/cf/feature/bestmx_is_local.m4 index ec4c81c..22c8723 100644 --- a/contrib/sendmail/cf/feature/bestmx_is_local.m4 +++ b/contrib/sendmail/cf/feature/bestmx_is_local.m4 @@ -1,6 +1,7 @@ divert(-1) # -# Copyright (c) 1998 Sendmail, Inc. All rights reserved. +# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# All rights reserved. # Copyright (c) 1983 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 # The Regents of the University of California. All rights reserved. @@ -12,7 +13,7 @@ divert(-1) # divert(0) -VERSIONID(`@(#)bestmx_is_local.m4 8.14 (Berkeley) 1/25/1999') +VERSIONID(`$Id: bestmx_is_local.m4,v 8.24 1999/10/18 21:50:24 ca Exp $') divert(-1) define(_BESTMX_IS_LOCAL_, _ARG_) @@ -20,7 +21,7 @@ define(_BESTMX_IS_LOCAL_, _ARG_) LOCAL_CONFIG # turn on bestMX lookup table Kbestmx bestmx -ifelse(_ARG_, `', `dnl',` +ifelse(defn(`_ARG_'), `', `dnl',` # limit bestmx to these domains CB`'_ARG_') @@ -37,13 +38,14 @@ LOCAL_NET_CONFIG # low to medium traffic hosts. If you use the limited bestmx # by passing in a set of possible domains it will improve things. -ifelse(_ARG_, `', `dnl +ifelse(defn(`_ARG_'), `', `dnl # unlimited bestmx R$* < @ $* > $* $: $1 < @ $2 @@ $(bestmx $2 $) > $3', `dnl # limit bestmx to $=B R$* < @ $* $=B . > $* $: $1 < @ $2 $3 . @@ $(bestmx $2 $3 . $) > $4') -R$* $=O $* < @ $* @@ $=w . > $* $@ $>97 $1 $2 $3 -R< @ $* @@ $=w . > : $* $@ $>97 $3 -R$* < @ $* @@ $=w . > $* $#local $: $1 +R$* $=O $* < @ $* @@ $=w . > $* $@ $>Recurse $1 $2 $3 +R< @ $* @@ $=w . > : $* $@ $>Recurse $3 +dnl we cannot use _LOCAL_ here since it is defined too late +R$* < @ $* @@ $=w . > $* $@ $>CanonLocal < $1 > R$* < @ $* @@ $* > $* $: $1 < @ $2 > $4 diff --git a/contrib/sendmail/cf/feature/bitdomain.m4 b/contrib/sendmail/cf/feature/bitdomain.m4 index 7f9a181..7ac7304 100644 --- a/contrib/sendmail/cf/feature/bitdomain.m4 +++ b/contrib/sendmail/cf/feature/bitdomain.m4 @@ -1,6 +1,7 @@ divert(-1) # -# Copyright (c) 1998 Sendmail, Inc. All rights reserved. +# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# All rights reserved. # Copyright (c) 1983 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 # The Regents of the University of California. All rights reserved. @@ -12,11 +13,13 @@ divert(-1) # divert(0) -VERSIONID(`@(#)bitdomain.m4 8.14 (Berkeley) 10/6/1998') +VERSIONID(`$Id: bitdomain.m4,v 8.23 1999/07/22 17:55:34 gshapiro Exp $') divert(-1) -define(`BITDOMAIN_TABLE', ifelse(_ARG_, `', - ifdef(`_USE_ETC_MAIL_', - DATABASE_MAP_TYPE` -o /etc/mail/bitdomain', - DATABASE_MAP_TYPE` -o /etc/bitdomain'), - `_ARG_'))dnl +define(`_BITDOMAIN_TABLE_', `') + +LOCAL_CONFIG +# BITNET mapping table +Kbitdomain ifelse(defn(`_ARG_'), `', + DATABASE_MAP_TYPE MAIL_SETTINGS_DIR`bitdomain', + `_ARG_') diff --git a/contrib/sendmail/cf/feature/blacklist_recipients.m4 b/contrib/sendmail/cf/feature/blacklist_recipients.m4 index e3478d3..d6218d1 100644 --- a/contrib/sendmail/cf/feature/blacklist_recipients.m4 +++ b/contrib/sendmail/cf/feature/blacklist_recipients.m4 @@ -1,6 +1,7 @@ divert(-1) # -# Copyright (c) 1998 Sendmail, Inc. All rights reserved. +# Copyright (c) 1998, 1999 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 @@ -9,10 +10,10 @@ divert(-1) # divert(0) -VERSIONID(`@(#)blacklist_recipients.m4 8.9 (Berkeley) 5/19/1998') +VERSIONID(`$Id: blacklist_recipients.m4,v 8.13 1999/04/02 02:25:13 gshapiro Exp $') divert(-1) -ifdef(`ACCESS_TABLE', +ifdef(`_ACCESS_TABLE_', `define(`_BLACKLIST_RCPT_', 1)', `errprint(`*** ERROR: FEATURE(blacklist_recipients) requires FEATURE(access_db) ')') diff --git a/contrib/sendmail/cf/feature/delay_checks.m4 b/contrib/sendmail/cf/feature/delay_checks.m4 new file mode 100644 index 0000000..1592525 --- /dev/null +++ b/contrib/sendmail/cf/feature/delay_checks.m4 @@ -0,0 +1,22 @@ +divert(-1) +# +# Copyright (c) 1999-2000 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: delay_checks.m4,v 8.7 2000/02/26 01:32:02 gshapiro Exp $') +divert(-1) + +define(`_DELAY_CHECKS_', 1) +ifelse(defn(`_ARG_'), `', `', + lower(substr(_ARG_,0,1)), `f', `define(`_SPAM_FRIEND_', 1) define(`_SPAM_FH_', 1)', + lower(substr(_ARG_,0,1)), `h', `define(`_SPAM_HATER_', 1) define(`_SPAM_FH_', 1)', + `errprint(`*** ERROR: illegal argument _ARG_ for FEATURE(delay_checks) +') + ') diff --git a/contrib/sendmail/cf/feature/dnsbl.m4 b/contrib/sendmail/cf/feature/dnsbl.m4 new file mode 100644 index 0000000..fd3ceee --- /dev/null +++ b/contrib/sendmail/cf/feature/dnsbl.m4 @@ -0,0 +1,25 @@ +divert(-1) +# +# Copyright (c) 1998, 1999 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) +ifdef(`_DNSBL_R_',`dnl',`dnl +VERSIONID(`$Id: dnsbl.m4,v 8.18 1999/08/03 04:30:56 gshapiro Exp $')') +divert(-1) +define(`_DNSBL_SRV_', `ifelse(len(X`'_ARG_),`1',`rbl.maps.vix.com',_ARG_)')dnl +define(`_DNSBL_MSG_', `ifelse(len(X`'_ARG2_),`1',`"550 Mail from " $`'&{client_addr} " refused by blackhole site '_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<?>OK $: OKSOFAR +R<?>$+ $#error $@ 5.7.1 $: _DNSBL_MSG_ +divert(-1) diff --git a/contrib/sendmail/cf/feature/domaintable.m4 b/contrib/sendmail/cf/feature/domaintable.m4 index e7303dc..b609ec9 100644 --- a/contrib/sendmail/cf/feature/domaintable.m4 +++ b/contrib/sendmail/cf/feature/domaintable.m4 @@ -1,6 +1,7 @@ divert(-1) # -# Copyright (c) 1998 Sendmail, Inc. All rights reserved. +# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# All rights reserved. # Copyright (c) 1983 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 # The Regents of the University of California. All rights reserved. @@ -12,12 +13,13 @@ divert(-1) # divert(0) -VERSIONID(`@(#)domaintable.m4 8.9 (Berkeley) 10/6/1998') +VERSIONID(`$Id: domaintable.m4,v 8.17 1999/07/22 17:55:35 gshapiro Exp $') divert(-1) -define(`DOMAIN_TABLE', ifelse(_ARG_, `', - ifdef(`_USE_ETC_MAIL_', - DATABASE_MAP_TYPE` -o /etc/mail/domaintable', - DATABASE_MAP_TYPE` -o /etc/domaintable'), - `_ARG_'))dnl +define(`_DOMAIN_TABLE_', `') +LOCAL_CONFIG +# Domain table (adding domains) +Kdomaintable ifelse(defn(`_ARG_'), `', + DATABASE_MAP_TYPE MAIL_SETTINGS_DIR`domaintable', + `_ARG_') diff --git a/contrib/sendmail/cf/feature/generics_entire_domain.m4 b/contrib/sendmail/cf/feature/generics_entire_domain.m4 new file mode 100644 index 0000000..fab586a --- /dev/null +++ b/contrib/sendmail/cf/feature/generics_entire_domain.m4 @@ -0,0 +1,16 @@ +divert(-1) +# +# Copyright (c) 1999 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: generics_entire_domain.m4,v 8.1 1999/03/16 00:43:05 ca Exp $') +divert(-1) + +define(`_GENERICS_ENTIRE_DOMAIN_', 1) diff --git a/contrib/sendmail/cf/feature/genericstable.m4 b/contrib/sendmail/cf/feature/genericstable.m4 index 654db5d..9104948 100644 --- a/contrib/sendmail/cf/feature/genericstable.m4 +++ b/contrib/sendmail/cf/feature/genericstable.m4 @@ -1,6 +1,7 @@ divert(-1) # -# Copyright (c) 1998 Sendmail, Inc. All rights reserved. +# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# All rights reserved. # Copyright (c) 1983 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 # The Regents of the University of California. All rights reserved. @@ -12,11 +13,13 @@ divert(-1) # divert(0) -VERSIONID(`@(#)genericstable.m4 8.8 (Berkeley) 10/6/1998') +VERSIONID(`$Id: genericstable.m4,v 8.16 1999/07/22 17:55:35 gshapiro Exp $') divert(-1) -define(`GENERICS_TABLE', ifelse(_ARG_, `', - ifdef(`_USE_ETC_MAIL_', - DATABASE_MAP_TYPE` -o /etc/mail/genericstable', - DATABASE_MAP_TYPE` -o /etc/genericstable'), - `_ARG_'))dnl +define(`_GENERICS_TABLE_', `') + +LOCAL_CONFIG +# Generics table (mapping outgoing addresses) +Kgenerics ifelse(defn(`_ARG_'), `', + DATABASE_MAP_TYPE MAIL_SETTINGS_DIR`genericstable', + `_ARG_') diff --git a/contrib/sendmail/cf/feature/ldap_routing.m4 b/contrib/sendmail/cf/feature/ldap_routing.m4 new file mode 100644 index 0000000..7ea0c86 --- /dev/null +++ b/contrib/sendmail/cf/feature/ldap_routing.m4 @@ -0,0 +1,34 @@ +divert(-1) +# +# Copyright (c) 1999-2000 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: ldap_routing.m4,v 8.5.4.1 2000/07/15 18:05:05 gshapiro Exp $') +divert(-1) + +# Check first two arguments. If they aren't set, may need to warn in proto.m4 +ifelse(len(X`'_ARG1_), `1', `define(`_LDAP_ROUTING_WARN_', `yes')') +ifelse(len(X`'_ARG2_), `1', `define(`_LDAP_ROUTING_WARN_', `yes')') + +# Check for third argument to indicate how to deal with non-existant +# LDAP records +ifelse(len(X`'_ARG3_), `1', `define(`_LDAP_ROUTING_', `_PASS_THROUGH_')', + _ARG3_, `passthru', `define(`_LDAP_ROUTING_', `_PASS_THROUGH_')', + `define(`_LDAP_ROUTING_', `_MUST_EXIST_')') + +LOCAL_CONFIG +# LDAP routing maps +Kldapmh ifelse(len(X`'_ARG1_), `1', + `ldap -1 -v mailHost -k (&(objectClass=inetLocalMailRecipient)(mailLocalAddress=%0))', + `_ARG1_') + +Kldapmra ifelse(len(X`'_ARG2_), `1', + `ldap -1 -v mailRoutingAddress -k (&(objectClass=inetLocalMailRecipient)(mailLocalAddress=%0))', + `_ARG2_') diff --git a/contrib/sendmail/cf/feature/limited_masquerade.m4 b/contrib/sendmail/cf/feature/limited_masquerade.m4 index b036ae1..f86ebd4 100644 --- a/contrib/sendmail/cf/feature/limited_masquerade.m4 +++ b/contrib/sendmail/cf/feature/limited_masquerade.m4 @@ -1,6 +1,7 @@ divert(-1) # -# Copyright (c) 1998 Sendmail, Inc. All rights reserved. +# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# All rights reserved. # Copyright (c) 1983 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 # The Regents of the University of California. All rights reserved. @@ -12,7 +13,7 @@ divert(-1) # divert(0) -VERSIONID(`@(#)limited_masquerade.m4 8.6 (Berkeley) 5/19/1998') +VERSIONID(`$Id: limited_masquerade.m4,v 8.9 1999/02/07 07:26:09 gshapiro Exp $') divert(-1) define(`_LIMITED_MASQUERADE_', 1) diff --git a/contrib/sendmail/cf/feature/local_lmtp.m4 b/contrib/sendmail/cf/feature/local_lmtp.m4 index f328ce5..4b44eab 100644 --- a/contrib/sendmail/cf/feature/local_lmtp.m4 +++ b/contrib/sendmail/cf/feature/local_lmtp.m4 @@ -1,6 +1,7 @@ divert(-1) # -# Copyright (c) 1998 Sendmail, Inc. All rights reserved. +# Copyright (c) 1998, 1999 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 @@ -9,12 +10,17 @@ divert(-1) # divert(0) -VERSIONID(`@(#)local_lmtp.m4 8.5 (Berkeley) 5/19/1998') +VERSIONID(`$Id: local_lmtp.m4,v 8.15 1999/11/18 05:06:22 ca Exp $') divert(-1) +ifdef(`_MAILER_local_', + `errprint(`*** FEATURE(local_lmtp) must occur before MAILER(local) +')')dnl + define(`LOCAL_MAILER_PATH', - ifelse(_ARG_, `', + ifelse(defn(`_ARG_'), `', ifdef(`confEBINDIR', confEBINDIR, `/usr/libexec')`/mail.local', _ARG_)) -define(`LOCAL_MAILER_FLAGS', `SXfmnz9') +define(`LOCAL_MAILER_FLAGS', `PSXfmnz9') define(`LOCAL_MAILER_ARGS', `mail.local -l') +define(`LOCAL_MAILER_DSN_DIAGNOSTIC_CODE', `SMTP') diff --git a/contrib/sendmail/cf/feature/local_procmail.m4 b/contrib/sendmail/cf/feature/local_procmail.m4 index 20618dd..29bb980 100644 --- a/contrib/sendmail/cf/feature/local_procmail.m4 +++ b/contrib/sendmail/cf/feature/local_procmail.m4 @@ -1,6 +1,7 @@ divert(-1) # -# Copyright (c) 1998 Sendmail, Inc. All rights reserved. +# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# All rights reserved. # Copyright (c) 1994 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 # The Regents of the University of California. All rights reserved. @@ -12,14 +13,20 @@ divert(-1) # divert(0) -VERSIONID(`@(#)local_procmail.m4 8.11 (Berkeley) 5/19/1998') +VERSIONID(`$Id: local_procmail.m4,v 8.21 1999/11/18 05:06:23 ca Exp $') divert(-1) +ifdef(`_MAILER_local_', + `errprint(`*** FEATURE(local_procmail) must occur before MAILER(local) +')')dnl + define(`LOCAL_MAILER_PATH', - ifelse(_ARG_, `', + ifelse(defn(`_ARG_'), `', ifdef(`PROCMAIL_MAILER_PATH', PROCMAIL_MAILER_PATH, `/usr/local/bin/procmail'), _ARG_)) -define(`LOCAL_MAILER_FLAGS', `SPfhn9') -define(`LOCAL_MAILER_ARGS', `procmail -Y -a $h -d $u') +define(`LOCAL_MAILER_ARGS', + ifelse(len(X`'_ARG2_), `1', `procmail -Y -a $h -d $u', _ARG2_)) +define(`LOCAL_MAILER_FLAGS', + ifelse(len(X`'_ARG3_), `1', `SPfhn9', _ARG3_)) diff --git a/contrib/sendmail/cf/feature/loose_relay_check.m4 b/contrib/sendmail/cf/feature/loose_relay_check.m4 index 988e441..abd1b9c9 100644 --- a/contrib/sendmail/cf/feature/loose_relay_check.m4 +++ b/contrib/sendmail/cf/feature/loose_relay_check.m4 @@ -1,6 +1,7 @@ divert(-1) # -# Copyright (c) 1998 Sendmail, Inc. All rights reserved. +# Copyright (c) 1998, 1999 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 @@ -9,7 +10,7 @@ divert(-1) # divert(0) -VERSIONID(`@(#)loose_relay_check.m4 8.3 (Berkeley) 5/19/1998') +VERSIONID(`$Id: loose_relay_check.m4,v 8.6 1999/02/07 07:26:10 gshapiro Exp $') divert(-1) define(`_LOOSE_RELAY_CHECK_', 1) diff --git a/contrib/sendmail/cf/feature/mailertable.m4 b/contrib/sendmail/cf/feature/mailertable.m4 index 71a41ad..08c1bf6 100644 --- a/contrib/sendmail/cf/feature/mailertable.m4 +++ b/contrib/sendmail/cf/feature/mailertable.m4 @@ -1,6 +1,7 @@ divert(-1) # -# Copyright (c) 1998 Sendmail, Inc. All rights reserved. +# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# All rights reserved. # Copyright (c) 1983 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 # The Regents of the University of California. All rights reserved. @@ -12,11 +13,13 @@ divert(-1) # divert(0) -VERSIONID(`@(#)mailertable.m4 8.10 (Berkeley) 10/6/1998') +VERSIONID(`$Id: mailertable.m4,v 8.18 1999/07/22 17:55:35 gshapiro Exp $') divert(-1) -define(`MAILER_TABLE', ifelse(_ARG_, `', - ifdef(`_USE_ETC_MAIL_', - DATABASE_MAP_TYPE` -o /etc/mail/mailertable', - DATABASE_MAP_TYPE` -o /etc/mailertable'), - `_ARG_'))dnl +define(`_MAILER_TABLE_', `') + +LOCAL_CONFIG +# Mailer table (overriding domains) +Kmailertable ifelse(defn(`_ARG_'), `', + DATABASE_MAP_TYPE MAIL_SETTINGS_DIR`mailertable', + `_ARG_') diff --git a/contrib/sendmail/cf/feature/masquerade_entire_domain.m4 b/contrib/sendmail/cf/feature/masquerade_entire_domain.m4 index 4455b9a..e2bcc65 100644 --- a/contrib/sendmail/cf/feature/masquerade_entire_domain.m4 +++ b/contrib/sendmail/cf/feature/masquerade_entire_domain.m4 @@ -1,6 +1,7 @@ divert(-1) # -# Copyright (c) 1998 Sendmail, Inc. All rights reserved. +# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# All rights reserved. # Copyright (c) 1983 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 # The Regents of the University of California. All rights reserved. @@ -12,7 +13,7 @@ divert(-1) # divert(0) -VERSIONID(`@(#)masquerade_entire_domain.m4 8.6 (Berkeley) 5/19/1998') +VERSIONID(`$Id: masquerade_entire_domain.m4,v 8.9 1999/02/07 07:26:10 gshapiro Exp $') divert(-1) define(`_MASQUERADE_ENTIRE_DOMAIN_', 1) diff --git a/contrib/sendmail/cf/feature/masquerade_envelope.m4 b/contrib/sendmail/cf/feature/masquerade_envelope.m4 index 276c7f4..74d3aa0 100644 --- a/contrib/sendmail/cf/feature/masquerade_envelope.m4 +++ b/contrib/sendmail/cf/feature/masquerade_envelope.m4 @@ -1,6 +1,7 @@ divert(-1) # -# Copyright (c) 1998 Sendmail, Inc. All rights reserved. +# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# All rights reserved. # Copyright (c) 1983 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 # The Regents of the University of California. All rights reserved. @@ -12,7 +13,7 @@ divert(-1) # divert(0) -VERSIONID(`@(#)masquerade_envelope.m4 8.6 (Berkeley) 5/19/1998') +VERSIONID(`$Id: masquerade_envelope.m4,v 8.9 1999/02/07 07:26:10 gshapiro Exp $') divert(-1) define(`_MASQUERADE_ENVELOPE_', 1) diff --git a/contrib/sendmail/cf/feature/no_default_msa.m4 b/contrib/sendmail/cf/feature/no_default_msa.m4 new file mode 100644 index 0000000..3f5752a --- /dev/null +++ b/contrib/sendmail/cf/feature/no_default_msa.m4 @@ -0,0 +1,16 @@ +divert(-1) +# +# Copyright (c) 1999, 2000 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: no_default_msa.m4,v 8.1 2000/02/01 15:56:30 ca Exp $') +divert(-1) + +define(`_NO_MSA_', `1') diff --git a/contrib/sendmail/cf/feature/nocanonify.m4 b/contrib/sendmail/cf/feature/nocanonify.m4 index 279a8ea..05baa7a 100644 --- a/contrib/sendmail/cf/feature/nocanonify.m4 +++ b/contrib/sendmail/cf/feature/nocanonify.m4 @@ -1,6 +1,7 @@ divert(-1) # -# Copyright (c) 1998 Sendmail, Inc. All rights reserved. +# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# All rights reserved. # Copyright (c) 1983 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 # The Regents of the University of California. All rights reserved. @@ -12,7 +13,12 @@ divert(-1) # divert(0) -VERSIONID(`@(#)nocanonify.m4 8.6 (Berkeley) 5/19/1998') +VERSIONID(`$Id: nocanonify.m4,v 8.12 1999/08/28 00:42:01 ca Exp $') divert(-1) define(`_NO_CANONIFY_', 1) +ifelse(defn(`_ARG_'), `', `', + strcasecmp(defn(`_ARG_'), `canonify_hosts'), `1', + `define(`_CANONIFY_HOSTS_', 1)', + `errprint(`*** ERROR: unknown parameter '"defn(`_ARG_')"` for FEATURE(`nocanonify') +')') diff --git a/contrib/sendmail/cf/feature/nodns.m4 b/contrib/sendmail/cf/feature/nodns.m4 index 5d383d5..c5acadf 100644 --- a/contrib/sendmail/cf/feature/nodns.m4 +++ b/contrib/sendmail/cf/feature/nodns.m4 @@ -1,6 +1,7 @@ divert(-1) # -# Copyright (c) 1998 Sendmail, Inc. All rights reserved. +# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# All rights reserved. # Copyright (c) 1983 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 # The Regents of the University of California. All rights reserved. @@ -12,10 +13,10 @@ divert(-1) # divert(0) -VERSIONID(`@(#)nodns.m4 8.9 (Berkeley) 10/6/1998') +VERSIONID(`$Id: nodns.m4,v 8.14 1999/07/22 17:55:35 gshapiro Exp $') divert(-1) undefine(`confBIND_OPTS')dnl errprint(`FEATURE(nodns) is no-op. -Use ServiceSwitchFile ('ifdef(`confSERVICE_SWITCH_FILE',confSERVICE_SWITCH_FILE,ifdef(`_USE_ETC_MAIL_',`/etc/mail/service.switch',`/etc/service.switch'))`) if your OS does not provide its own instead. +Use ServiceSwitchFile ('ifdef(`confSERVICE_SWITCH_FILE',confSERVICE_SWITCH_FILE,MAIL_SETTINGS_DIR`service.switch')`) if your OS does not provide its own instead. ') diff --git a/contrib/sendmail/cf/feature/notsticky.m4 b/contrib/sendmail/cf/feature/notsticky.m4 index 5ba6b2f..1cecca5 100644 --- a/contrib/sendmail/cf/feature/notsticky.m4 +++ b/contrib/sendmail/cf/feature/notsticky.m4 @@ -1,6 +1,7 @@ divert(-1) # -# Copyright (c) 1998 Sendmail, Inc. All rights reserved. +# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# All rights reserved. # Copyright (c) 1983 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 # The Regents of the University of California. All rights reserved. @@ -12,7 +13,7 @@ divert(-1) # divert(0) -VERSIONID(`@(#)notsticky.m4 8.8 (Berkeley) 5/19/1998') +VERSIONID(`$Id: notsticky.m4,v 8.11 1999/02/07 07:26:11 gshapiro Exp $') # # This is now the default. Use ``FEATURE(stickyhost)'' if you want # the old default behaviour. diff --git a/contrib/sendmail/cf/feature/nouucp.m4 b/contrib/sendmail/cf/feature/nouucp.m4 index 7cf241f..a031049 100644 --- a/contrib/sendmail/cf/feature/nouucp.m4 +++ b/contrib/sendmail/cf/feature/nouucp.m4 @@ -1,6 +1,7 @@ divert(-1) # -# Copyright (c) 1998 Sendmail, Inc. All rights reserved. +# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# All rights reserved. # Copyright (c) 1983 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 # The Regents of the University of California. All rights reserved. @@ -12,7 +13,15 @@ divert(-1) # divert(0) -VERSIONID(`@(#)nouucp.m4 8.6 (Berkeley) 5/19/1998') +VERSIONID(`$Id: nouucp.m4,v 8.13 1999/11/24 18:37:07 ca Exp $') divert(-1) -define(`_NO_UUCP_', 1) +ifelse(defn(`_ARG_'), `', + `errprint(`*** ERROR: missing argument for FEATURE(nouucp): + use `reject' or `nospecial'. See cf/README. +')define(`_NO_UUCP_', `e')', + substr(_ARG_,0,1), `r', `define(`_NO_UUCP_', `r')', + substr(_ARG_,0,1), `n', `define(`_NO_UUCP_', `n')', + `errprint(`*** ERROR: illegal argument _ARG_ for FEATURE(nouucp) +') + ') diff --git a/contrib/sendmail/cf/feature/nullclient.m4 b/contrib/sendmail/cf/feature/nullclient.m4 index 99346ae..1354e56 100644 --- a/contrib/sendmail/cf/feature/nullclient.m4 +++ b/contrib/sendmail/cf/feature/nullclient.m4 @@ -1,6 +1,7 @@ -PUSHDIVERT(-1) +divert(-1) # -# Copyright (c) 1998 Sendmail, Inc. All rights reserved. +# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# All rights reserved. # Copyright (c) 1983 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 # The Regents of the University of California. All rights reserved. @@ -10,11 +11,8 @@ PUSHDIVERT(-1) # the sendmail distribution. # # -ifdef(`SMTP_MAILER_FLAGS',, `define(`SMTP_MAILER_FLAGS', `')') -define(_NULL_CLIENT_ONLY_, `1') -ifelse(_ARG_, `', `errprint(`Feature "nullclient" requires argument')', - `define(`MAIL_HUB', _ARG_)') -POPDIVERT +ifelse(defn(`_ARG_'), `', `errprint(`Feature "nullclient" requires argument')', + `define(`_NULL_CLIENT_', _ARG_)') # # This is used only for relaying mail from a client to a hub when @@ -23,28 +21,17 @@ POPDIVERT # sendmail. # -VERSIONID(`@(#)nullclient.m4 8.12 (Berkeley) 5/19/1998') +divert(0) +VERSIONID(`$Id: nullclient.m4,v 8.21.16.1 2000/05/26 18:08:41 gshapiro Exp $') +divert(-1) -PUSHDIVERT(6) -# hub host (to which all mail is sent) -DH`'ifdef(`MAIL_HUB', MAIL_HUB, - `errprint(`MAIL_HUB not defined for nullclient feature')') -ifdef(`MASQUERADE_NAME',, `define(`MASQUERADE_NAME', MAIL_HUB)')dnl - -# route-addr separators -C: : , -POPDIVERT -PUSHDIVERT(7) -############################################ -### Null Client Mailer specification ### -############################################ - -ifdef(`confRELAY_MAILER',, - `define(`confRELAY_MAILER', `nullclient')')dnl -ifdef(`confFROM_HEADER',, - `define(`confFROM_HEADER', <$g>)')dnl -ifdef(`SMTP_MAILER_ARGS',, `define(`SMTP_MAILER_ARGS', `IPC $h')')dnl - -Mnullclient, P=[IPC], F=CONCAT(mDFMuXa, SMTP_MAILER_FLAGS),ifdef(`SMTP_MAILER_MAX', ` M=SMTP_MAILER_MAX,') - A=SMTP_MAILER_ARGS -POPDIVERT +undefine(`ALIAS_FILE') +define(`MAIL_HUB', _NULL_CLIENT_) +define(`SMART_HOST', _NULL_CLIENT_) +define(`confFORWARD_PATH', `') +define(`_DEF_LOCAL_MAILER_FLAGS', `lsDFM5q') +MASQUERADE_AS(_NULL_CLIENT_) +FEATURE(`allmasquerade') +FEATURE(`masquerade_envelope') +MAILER(`local') +MAILER(`smtp') diff --git a/contrib/sendmail/cf/feature/promiscuous_relay.m4 b/contrib/sendmail/cf/feature/promiscuous_relay.m4 index cc3dae6..86db75f 100644 --- a/contrib/sendmail/cf/feature/promiscuous_relay.m4 +++ b/contrib/sendmail/cf/feature/promiscuous_relay.m4 @@ -1,6 +1,7 @@ divert(-1) # -# Copyright (c) 1998 Sendmail, Inc. All rights reserved. +# Copyright (c) 1998, 1999 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 @@ -9,7 +10,7 @@ divert(-1) # divert(0) -VERSIONID(`@(#)promiscuous_relay.m4 8.7 (Berkeley) 5/19/1998') +VERSIONID(`$Id: promiscuous_relay.m4,v 8.10 1999/02/07 07:26:11 gshapiro Exp $') divert(-1) define(`_PROMISCUOUS_RELAY_', 1) diff --git a/contrib/sendmail/cf/feature/rbl.m4 b/contrib/sendmail/cf/feature/rbl.m4 index 0284aa3..6e5d159 100644 --- a/contrib/sendmail/cf/feature/rbl.m4 +++ b/contrib/sendmail/cf/feature/rbl.m4 @@ -9,7 +9,10 @@ divert(-1) # divert(0) -VERSIONID(`@(#)rbl.m4 8.8 (Berkeley) 5/19/1998') +VERSIONID(`$Id: rbl.m4,v 8.17 1999/04/04 00:51:12 ca Exp $') divert(-1) -define(`_RBL_', ifelse(_ARG_, `', `rbl.maps.vix.com', `_ARG_'))dnl +define(`_RBL_', ifelse(defn(`_ARG_'), `', `rbl.maps.vix.com', `_ARG_'))dnl +ifelse(defn(`_ARG_'), `', `', ` +errprint(`Warning: FEATURE(`rbl') is deprecated, use FEATURE(`dnsbl') instead +')')dnl diff --git a/contrib/sendmail/cf/feature/redirect.m4 b/contrib/sendmail/cf/feature/redirect.m4 index a9b333f..e167865 100644 --- a/contrib/sendmail/cf/feature/redirect.m4 +++ b/contrib/sendmail/cf/feature/redirect.m4 @@ -1,6 +1,7 @@ divert(-1) # -# Copyright (c) 1998 Sendmail, Inc. All rights reserved. +# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# All rights reserved. # Copyright (c) 1983 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 # The Regents of the University of California. All rights reserved. @@ -12,17 +13,14 @@ divert(-1) # divert(0) -VERSIONID(`@(#)redirect.m4 8.10 (Berkeley) 5/19/1998') +VERSIONID(`$Id: redirect.m4,v 8.15 1999/08/06 01:47:36 gshapiro Exp $') divert(-1) - -PUSHDIVERT(3) +LOCAL_RULE_0 # addresses sent to foo@host.REDIRECT will give a 551 error code R$* < @ $+ .REDIRECT. > $: $1 < @ $2 . REDIRECT . > < ${opMode} > R$* < @ $+ .REDIRECT. > <i> $: $1 < @ $2 . REDIRECT. > -R$* < @ $+ .REDIRECT. > < $- > $# error $@ 5.1.1 $: "551 User has moved; please try " <$1@$2> -POPDIVERT +R$* < @ $+ .REDIRECT. > < $- > $#error $@ 5.1.1 $: "551 User has moved; please try " <$1@$2> -PUSHDIVERT(6) +LOCAL_CONFIG CPREDIRECT -POPDIVERT diff --git a/contrib/sendmail/cf/feature/relay_based_on_MX.m4 b/contrib/sendmail/cf/feature/relay_based_on_MX.m4 index f19e89b..872680a 100644 --- a/contrib/sendmail/cf/feature/relay_based_on_MX.m4 +++ b/contrib/sendmail/cf/feature/relay_based_on_MX.m4 @@ -1,6 +1,7 @@ divert(-1) # -# Copyright (c) 1998 Sendmail, Inc. All rights reserved. +# Copyright (c) 1998, 1999 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 @@ -9,7 +10,12 @@ divert(-1) # divert(0) -VERSIONID(`@(#)relay_based_on_MX.m4 8.7 (Berkeley) 5/19/1998') +VERSIONID(`$Id: relay_based_on_MX.m4,v 8.11 1999/04/02 02:25:13 gshapiro Exp $') divert(-1) define(`_RELAY_MX_SERVED_', 1) + +LOCAL_CONFIG +# MX map (to allow relaying to hosts that we MX for) +Kmxserved bestmx -z: -T<TEMP> + diff --git a/contrib/sendmail/cf/feature/relay_entire_domain.m4 b/contrib/sendmail/cf/feature/relay_entire_domain.m4 index c932a70..a720b16 100644 --- a/contrib/sendmail/cf/feature/relay_entire_domain.m4 +++ b/contrib/sendmail/cf/feature/relay_entire_domain.m4 @@ -1,6 +1,7 @@ divert(-1) # -# Copyright (c) 1998 Sendmail, Inc. All rights reserved. +# Copyright (c) 1998, 1999 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 @@ -9,7 +10,7 @@ divert(-1) # divert(0) -VERSIONID(`@(#)relay_entire_domain.m4 8.7 (Berkeley) 5/19/1998') +VERSIONID(`$Id: relay_entire_domain.m4,v 8.10 1999/02/07 07:26:12 gshapiro Exp $') divert(-1) define(`_RELAY_ENTIRE_DOMAIN_', 1) diff --git a/contrib/sendmail/cf/feature/relay_hosts_only.m4 b/contrib/sendmail/cf/feature/relay_hosts_only.m4 index 35f7ab5..867d4ed 100644 --- a/contrib/sendmail/cf/feature/relay_hosts_only.m4 +++ b/contrib/sendmail/cf/feature/relay_hosts_only.m4 @@ -1,6 +1,7 @@ divert(-1) # -# Copyright (c) 1998 Sendmail, Inc. All rights reserved. +# Copyright (c) 1998, 1999 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 @@ -9,7 +10,7 @@ divert(-1) # divert(0) -VERSIONID(`@(#)relay_hosts_only.m4 8.7 (Berkeley) 5/19/1998') +VERSIONID(`$Id: relay_hosts_only.m4,v 8.10 1999/02/07 07:26:12 gshapiro Exp $') divert(-1) define(`_RELAY_HOSTS_ONLY_', 1) diff --git a/contrib/sendmail/cf/feature/relay_local_from.m4 b/contrib/sendmail/cf/feature/relay_local_from.m4 index ab040f6..6e1aa80 100644 --- a/contrib/sendmail/cf/feature/relay_local_from.m4 +++ b/contrib/sendmail/cf/feature/relay_local_from.m4 @@ -1,6 +1,7 @@ divert(-1) # -# Copyright (c) 1998 Sendmail, Inc. All rights reserved. +# Copyright (c) 1998, 1999 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 @@ -9,7 +10,7 @@ divert(-1) # divert(0) -VERSIONID(`@(#)relay_local_from.m4 8.2 (Berkeley) 5/19/1998') +VERSIONID(`$Id: relay_local_from.m4,v 8.5 1999/02/07 07:26:12 gshapiro Exp $') divert(-1) define(`_RELAY_LOCAL_FROM_', 1) diff --git a/contrib/sendmail/cf/feature/relay_mail_from.m4 b/contrib/sendmail/cf/feature/relay_mail_from.m4 new file mode 100644 index 0000000..f66408d --- /dev/null +++ b/contrib/sendmail/cf/feature/relay_mail_from.m4 @@ -0,0 +1,20 @@ +divert(-1) +# +# Copyright (c) 1999 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: relay_mail_from.m4,v 8.2 1999/04/02 02:25:13 gshapiro 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) +')') diff --git a/contrib/sendmail/cf/feature/smrsh.m4 b/contrib/sendmail/cf/feature/smrsh.m4 index 3b44fa8..2159ff8 100644 --- a/contrib/sendmail/cf/feature/smrsh.m4 +++ b/contrib/sendmail/cf/feature/smrsh.m4 @@ -1,6 +1,7 @@ divert(-1) # -# Copyright (c) 1998 Sendmail, Inc. All rights reserved. +# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# All rights reserved. # Copyright (c) 1983 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 # The Regents of the University of California. All rights reserved. @@ -12,12 +13,14 @@ divert(-1) # divert(0) -VERSIONID(`@(#)smrsh.m4 8.8 (Berkeley) 5/19/1998') +VERSIONID(`$Id: smrsh.m4,v 8.14 1999/11/18 05:06:23 ca Exp $') divert(-1) ifdef(`_MAILER_local_', - `errprint(`*** FEATURE(smrsh) must occur before MAILER(local)')')dnl + `errprint(`*** FEATURE(smrsh) must occur before MAILER(local) +')')dnl define(`LOCAL_SHELL_PATH', - ifelse(_ARG_, `', + ifelse(defn(`_ARG_'), `', ifdef(`confEBINDIR', confEBINDIR, `/usr/libexec')`/smrsh', _ARG_)) +_DEFIFNOT(`LOCAL_SHELL_ARGS', `smrsh -c $u') diff --git a/contrib/sendmail/cf/feature/stickyhost.m4 b/contrib/sendmail/cf/feature/stickyhost.m4 index 1d0d1cd..1e95be4 100644 --- a/contrib/sendmail/cf/feature/stickyhost.m4 +++ b/contrib/sendmail/cf/feature/stickyhost.m4 @@ -1,6 +1,7 @@ divert(-1) # -# Copyright (c) 1998 Sendmail, Inc. All rights reserved. +# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# All rights reserved. # Copyright (c) 1983 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 # The Regents of the University of California. All rights reserved. @@ -12,7 +13,7 @@ divert(-1) # divert(0) -VERSIONID(`@(#)stickyhost.m4 8.6 (Berkeley) 5/19/1998') +VERSIONID(`$Id: stickyhost.m4,v 8.9 1999/02/07 07:26:13 gshapiro Exp $') divert(-1) define(`_STICKY_LOCAL_DOMAIN_', 1) diff --git a/contrib/sendmail/cf/feature/use_ct_file.m4 b/contrib/sendmail/cf/feature/use_ct_file.m4 index 924dd06..e87ca62 100644 --- a/contrib/sendmail/cf/feature/use_ct_file.m4 +++ b/contrib/sendmail/cf/feature/use_ct_file.m4 @@ -1,6 +1,7 @@ divert(-1) # -# Copyright (c) 1998 Sendmail, Inc. All rights reserved. +# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# All rights reserved. # Copyright (c) 1983 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 # The Regents of the University of California. All rights reserved. @@ -12,7 +13,7 @@ divert(-1) # divert(0) -VERSIONID(`@(#)use_ct_file.m4 8.6 (Berkeley) 5/19/1998') +VERSIONID(`$Id: use_ct_file.m4,v 8.9 1999/02/07 07:26:13 gshapiro Exp $') divert(-1) # if defined, the sendmail.cf will read the /etc/sendmail.ct file diff --git a/contrib/sendmail/cf/feature/use_cw_file.m4 b/contrib/sendmail/cf/feature/use_cw_file.m4 index 5bbbf7b..c7e1cee 100644 --- a/contrib/sendmail/cf/feature/use_cw_file.m4 +++ b/contrib/sendmail/cf/feature/use_cw_file.m4 @@ -1,6 +1,7 @@ divert(-1) # -# Copyright (c) 1998 Sendmail, Inc. All rights reserved. +# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# All rights reserved. # Copyright (c) 1983 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 # The Regents of the University of California. All rights reserved. @@ -12,7 +13,7 @@ divert(-1) # divert(0) -VERSIONID(`@(#)use_cw_file.m4 8.6 (Berkeley) 5/19/1998') +VERSIONID(`$Id: use_cw_file.m4,v 8.9 1999/02/07 07:26:13 gshapiro Exp $') divert(-1) # if defined, the sendmail.cf will read the /etc/sendmail.cw file diff --git a/contrib/sendmail/cf/feature/uucpdomain.m4 b/contrib/sendmail/cf/feature/uucpdomain.m4 index 0c584aa..cc34032 100644 --- a/contrib/sendmail/cf/feature/uucpdomain.m4 +++ b/contrib/sendmail/cf/feature/uucpdomain.m4 @@ -1,6 +1,7 @@ divert(-1) # -# Copyright (c) 1998 Sendmail, Inc. All rights reserved. +# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# All rights reserved. # Copyright (c) 1983 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 # The Regents of the University of California. All rights reserved. @@ -12,11 +13,13 @@ divert(-1) # divert(0) -VERSIONID(`@(#)uucpdomain.m4 8.14 (Berkeley) 10/6/1998') +VERSIONID(`$Id: uucpdomain.m4,v 8.22 1999/07/22 17:55:35 gshapiro Exp $') divert(-1) -define(`UUDOMAIN_TABLE', ifelse(_ARG_, `', - ifdef(`_USE_ETC_MAIL_', - DATABASE_MAP_TYPE` -o /etc/mail/uudomain', - DATABASE_MAP_TYPE` -o /etc/uudomain'), - `_ARG_'))dnl +define(`_UUDOMAIN_TABLE_', `') + +LOCAL_CONFIG +# UUCP domain table +Kuudomain ifelse(defn(`_ARG_'), `', + DATABASE_MAP_TYPE MAIL_SETTINGS_DIR`uudomain', + `_ARG_') diff --git a/contrib/sendmail/cf/feature/virtuser_entire_domain.m4 b/contrib/sendmail/cf/feature/virtuser_entire_domain.m4 new file mode 100644 index 0000000..5a1d9f0 --- /dev/null +++ b/contrib/sendmail/cf/feature/virtuser_entire_domain.m4 @@ -0,0 +1,16 @@ +divert(-1) +# +# Copyright (c) 1999 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: virtuser_entire_domain.m4,v 8.2 1999/03/16 00:43:05 ca Exp $') +divert(-1) + +define(`_VIRTUSER_ENTIRE_DOMAIN_', 1) diff --git a/contrib/sendmail/cf/feature/virtusertable.m4 b/contrib/sendmail/cf/feature/virtusertable.m4 index 316f7ea..b1f6028 100644 --- a/contrib/sendmail/cf/feature/virtusertable.m4 +++ b/contrib/sendmail/cf/feature/virtusertable.m4 @@ -1,6 +1,7 @@ divert(-1) # -# Copyright (c) 1998 Sendmail, Inc. All rights reserved. +# Copyright (c) 1998, 1999 Sendmail, Inc. and its suppliers. +# All rights reserved. # Copyright (c) 1983 Eric P. Allman. All rights reserved. # Copyright (c) 1988, 1993 # The Regents of the University of California. All rights reserved. @@ -12,11 +13,13 @@ divert(-1) # divert(0) -VERSIONID(`@(#)virtusertable.m4 8.8 (Berkeley) 10/6/1998') +VERSIONID(`$Id: virtusertable.m4,v 8.16 1999/07/22 17:55:36 gshapiro Exp $') divert(-1) -define(`VIRTUSER_TABLE', ifelse(_ARG_, `', - ifdef(`_USE_ETC_MAIL_', - DATABASE_MAP_TYPE` -o /etc/mail/virtusertable', - DATABASE_MAP_TYPE` -o /etc/virtusertable'), - `_ARG_'))dnl +define(`_VIRTUSER_TABLE_', `') + +LOCAL_CONFIG +# Virtual user table (maps incoming users) +Kvirtuser ifelse(defn(`_ARG_'), `', + DATABASE_MAP_TYPE MAIL_SETTINGS_DIR`virtusertable', + `_ARG_') |