aboutsummaryrefslogtreecommitdiff
path: root/contrib/sendmail/cf/feature
diff options
context:
space:
mode:
authorPeter Wemm <peter@FreeBSD.org>1999-01-12 12:26:57 +0000
committerPeter Wemm <peter@FreeBSD.org>1999-01-12 12:26:57 +0000
commit065a643db393fd78e62e8b414b4789e13fbdb5ae (patch)
tree8d45e99e5e320ab4e55408b355a04b2be475a0ed /contrib/sendmail/cf/feature
parentc2aa98e247e56d5266d789dfc9b90b524b0019fe (diff)
Import sendmail-8.9.2 onto vendor branch (update from 8.9.1)
Obtained from: ftp.sendamil.org
Notes
Notes: svn path=/vendor/sendmail/dist/; revision=42575
Diffstat (limited to 'contrib/sendmail/cf/feature')
-rw-r--r--contrib/sendmail/cf/feature/accept_unqualified_senders.m42
-rw-r--r--contrib/sendmail/cf/feature/accept_unresolvable_domains.m42
-rw-r--r--contrib/sendmail/cf/feature/access_db.m42
-rw-r--r--contrib/sendmail/cf/feature/allmasquerade.m42
-rw-r--r--contrib/sendmail/cf/feature/always_add_domain.m42
-rw-r--r--contrib/sendmail/cf/feature/bestmx_is_local.m44
-rw-r--r--contrib/sendmail/cf/feature/bitdomain.m48
-rw-r--r--contrib/sendmail/cf/feature/blacklist_recipients.m42
-rw-r--r--contrib/sendmail/cf/feature/domaintable.m49
-rw-r--r--contrib/sendmail/cf/feature/genericstable.m48
-rw-r--r--contrib/sendmail/cf/feature/limited_masquerade.m42
-rw-r--r--contrib/sendmail/cf/feature/local_lmtp.m42
-rw-r--r--contrib/sendmail/cf/feature/local_procmail.m42
-rw-r--r--contrib/sendmail/cf/feature/loose_relay_check.m42
-rw-r--r--contrib/sendmail/cf/feature/mailertable.m48
-rw-r--r--contrib/sendmail/cf/feature/masquerade_entire_domain.m42
-rw-r--r--contrib/sendmail/cf/feature/masquerade_envelope.m42
-rw-r--r--contrib/sendmail/cf/feature/nocanonify.m42
-rw-r--r--contrib/sendmail/cf/feature/nodns.m44
-rw-r--r--contrib/sendmail/cf/feature/notsticky.m42
-rw-r--r--contrib/sendmail/cf/feature/nouucp.m42
-rw-r--r--contrib/sendmail/cf/feature/nullclient.m42
-rw-r--r--contrib/sendmail/cf/feature/promiscuous_relay.m42
-rw-r--r--contrib/sendmail/cf/feature/rbl.m42
-rw-r--r--contrib/sendmail/cf/feature/redirect.m42
-rw-r--r--contrib/sendmail/cf/feature/relay_based_on_MX.m42
-rw-r--r--contrib/sendmail/cf/feature/relay_entire_domain.m42
-rw-r--r--contrib/sendmail/cf/feature/relay_hosts_only.m42
-rw-r--r--contrib/sendmail/cf/feature/relay_local_from.m42
-rw-r--r--contrib/sendmail/cf/feature/smrsh.m42
-rw-r--r--contrib/sendmail/cf/feature/stickyhost.m42
-rw-r--r--contrib/sendmail/cf/feature/use_ct_file.m42
-rw-r--r--contrib/sendmail/cf/feature/use_cw_file.m42
-rw-r--r--contrib/sendmail/cf/feature/uucpdomain.m48
-rw-r--r--contrib/sendmail/cf/feature/virtusertable.m48
35 files changed, 69 insertions, 42 deletions
diff --git a/contrib/sendmail/cf/feature/accept_unqualified_senders.m4 b/contrib/sendmail/cf/feature/accept_unqualified_senders.m4
index 16bef7825394..bf1b1e798452 100644
--- a/contrib/sendmail/cf/feature/accept_unqualified_senders.m4
+++ b/contrib/sendmail/cf/feature/accept_unqualified_senders.m4
@@ -9,7 +9,7 @@ divert(-1)
#
divert(0)
-VERSIONID(`@(#)accept_unqualified_senders.m4 8.3 (Berkeley) 5/19/98')
+VERSIONID(`@(#)accept_unqualified_senders.m4 8.3 (Berkeley) 5/19/1998')
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 5b7241a314e5..cbc4747d2207 100644
--- a/contrib/sendmail/cf/feature/accept_unresolvable_domains.m4
+++ b/contrib/sendmail/cf/feature/accept_unresolvable_domains.m4
@@ -9,7 +9,7 @@ divert(-1)
#
divert(0)
-VERSIONID(`@(#)accept_unresolvable_domains.m4 8.7 (Berkeley) 5/19/98')
+VERSIONID(`@(#)accept_unresolvable_domains.m4 8.7 (Berkeley) 5/19/1998')
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 85820723deee..75b5551ac2ce 100644
--- a/contrib/sendmail/cf/feature/access_db.m4
+++ b/contrib/sendmail/cf/feature/access_db.m4
@@ -9,7 +9,7 @@ divert(-1)
#
divert(0)
-VERSIONID(`@(#)access_db.m4 8.8 (Berkeley) 5/19/98')
+VERSIONID(`@(#)access_db.m4 8.8 (Berkeley) 5/19/1998')
divert(-1)
define(`ACCESS_TABLE',
diff --git a/contrib/sendmail/cf/feature/allmasquerade.m4 b/contrib/sendmail/cf/feature/allmasquerade.m4
index 42121e5cc488..ed622dcac6c6 100644
--- a/contrib/sendmail/cf/feature/allmasquerade.m4
+++ b/contrib/sendmail/cf/feature/allmasquerade.m4
@@ -12,7 +12,7 @@ divert(-1)
#
divert(0)
-VERSIONID(`@(#)allmasquerade.m4 8.7 (Berkeley) 5/19/98')
+VERSIONID(`@(#)allmasquerade.m4 8.7 (Berkeley) 5/19/1998')
divert(-1)
diff --git a/contrib/sendmail/cf/feature/always_add_domain.m4 b/contrib/sendmail/cf/feature/always_add_domain.m4
index e609bf000277..69092e31d008 100644
--- a/contrib/sendmail/cf/feature/always_add_domain.m4
+++ b/contrib/sendmail/cf/feature/always_add_domain.m4
@@ -12,7 +12,7 @@ divert(-1)
#
divert(0)
-VERSIONID(`@(#)always_add_domain.m4 8.6 (Berkeley) 5/19/98')
+VERSIONID(`@(#)always_add_domain.m4 8.6 (Berkeley) 5/19/1998')
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 2d3048809ecc..40643877af88 100644
--- a/contrib/sendmail/cf/feature/bestmx_is_local.m4
+++ b/contrib/sendmail/cf/feature/bestmx_is_local.m4
@@ -12,9 +12,11 @@ divert(-1)
#
divert(0)
-VERSIONID(`@(#)bestmx_is_local.m4 8.12 (Berkeley) 5/19/98')
+VERSIONID(`@(#)bestmx_is_local.m4 8.13 (Berkeley) 8/13/1998')
divert(-1)
+define(_BESTMX_IS_LOCAL_, _ARG_)
+
LOCAL_CONFIG
# turn on bestMX lookup table
Kbestmx bestmx
diff --git a/contrib/sendmail/cf/feature/bitdomain.m4 b/contrib/sendmail/cf/feature/bitdomain.m4
index be5155bd3242..7f9a181e4826 100644
--- a/contrib/sendmail/cf/feature/bitdomain.m4
+++ b/contrib/sendmail/cf/feature/bitdomain.m4
@@ -12,7 +12,11 @@ divert(-1)
#
divert(0)
-VERSIONID(`@(#)bitdomain.m4 8.13 (Berkeley) 5/19/98')
+VERSIONID(`@(#)bitdomain.m4 8.14 (Berkeley) 10/6/1998')
divert(-1)
-define(`BITDOMAIN_TABLE', ifelse(_ARG_, `', DATABASE_MAP_TYPE` -o /etc/bitdomain', `_ARG_'))dnl
+define(`BITDOMAIN_TABLE', ifelse(_ARG_, `',
+ ifdef(`_USE_ETC_MAIL_',
+ DATABASE_MAP_TYPE` -o /etc/mail/bitdomain',
+ DATABASE_MAP_TYPE` -o /etc/bitdomain'),
+ `_ARG_'))dnl
diff --git a/contrib/sendmail/cf/feature/blacklist_recipients.m4 b/contrib/sendmail/cf/feature/blacklist_recipients.m4
index 4417fe093695..e3478d36ff1a 100644
--- a/contrib/sendmail/cf/feature/blacklist_recipients.m4
+++ b/contrib/sendmail/cf/feature/blacklist_recipients.m4
@@ -9,7 +9,7 @@ divert(-1)
#
divert(0)
-VERSIONID(`@(#)blacklist_recipients.m4 8.9 (Berkeley) 5/19/98')
+VERSIONID(`@(#)blacklist_recipients.m4 8.9 (Berkeley) 5/19/1998')
divert(-1)
ifdef(`ACCESS_TABLE',
diff --git a/contrib/sendmail/cf/feature/domaintable.m4 b/contrib/sendmail/cf/feature/domaintable.m4
index 0bf9f05fb340..e7303dcdd87c 100644
--- a/contrib/sendmail/cf/feature/domaintable.m4
+++ b/contrib/sendmail/cf/feature/domaintable.m4
@@ -12,7 +12,12 @@ divert(-1)
#
divert(0)
-VERSIONID(`@(#)domaintable.m4 8.8 (Berkeley) 5/19/98')
+VERSIONID(`@(#)domaintable.m4 8.9 (Berkeley) 10/6/1998')
divert(-1)
-define(`DOMAIN_TABLE', ifelse(_ARG_, `', DATABASE_MAP_TYPE` -o /etc/domaintable', `_ARG_'))dnl
+define(`DOMAIN_TABLE', ifelse(_ARG_, `',
+ ifdef(`_USE_ETC_MAIL_',
+ DATABASE_MAP_TYPE` -o /etc/mail/domaintable',
+ DATABASE_MAP_TYPE` -o /etc/domaintable'),
+ `_ARG_'))dnl
+
diff --git a/contrib/sendmail/cf/feature/genericstable.m4 b/contrib/sendmail/cf/feature/genericstable.m4
index ec7a4d3f7d51..654db5d9a168 100644
--- a/contrib/sendmail/cf/feature/genericstable.m4
+++ b/contrib/sendmail/cf/feature/genericstable.m4
@@ -12,7 +12,11 @@ divert(-1)
#
divert(0)
-VERSIONID(`@(#)genericstable.m4 8.7 (Berkeley) 5/19/98')
+VERSIONID(`@(#)genericstable.m4 8.8 (Berkeley) 10/6/1998')
divert(-1)
-define(`GENERICS_TABLE', ifelse(_ARG_, `', DATABASE_MAP_TYPE` -o /etc/genericstable', `_ARG_'))dnl
+define(`GENERICS_TABLE', ifelse(_ARG_, `',
+ ifdef(`_USE_ETC_MAIL_',
+ DATABASE_MAP_TYPE` -o /etc/mail/genericstable',
+ DATABASE_MAP_TYPE` -o /etc/genericstable'),
+ `_ARG_'))dnl
diff --git a/contrib/sendmail/cf/feature/limited_masquerade.m4 b/contrib/sendmail/cf/feature/limited_masquerade.m4
index ae5e868ed966..b036ae134be6 100644
--- a/contrib/sendmail/cf/feature/limited_masquerade.m4
+++ b/contrib/sendmail/cf/feature/limited_masquerade.m4
@@ -12,7 +12,7 @@ divert(-1)
#
divert(0)
-VERSIONID(`@(#)limited_masquerade.m4 8.6 (Berkeley) 5/19/98')
+VERSIONID(`@(#)limited_masquerade.m4 8.6 (Berkeley) 5/19/1998')
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 f323b5b1908e..f328ce54a293 100644
--- a/contrib/sendmail/cf/feature/local_lmtp.m4
+++ b/contrib/sendmail/cf/feature/local_lmtp.m4
@@ -9,7 +9,7 @@ divert(-1)
#
divert(0)
-VERSIONID(`@(#)local_lmtp.m4 8.5 (Berkeley) 5/19/98')
+VERSIONID(`@(#)local_lmtp.m4 8.5 (Berkeley) 5/19/1998')
divert(-1)
define(`LOCAL_MAILER_PATH',
diff --git a/contrib/sendmail/cf/feature/local_procmail.m4 b/contrib/sendmail/cf/feature/local_procmail.m4
index adf1237b3987..20618dd5551c 100644
--- a/contrib/sendmail/cf/feature/local_procmail.m4
+++ b/contrib/sendmail/cf/feature/local_procmail.m4
@@ -12,7 +12,7 @@ divert(-1)
#
divert(0)
-VERSIONID(`@(#)local_procmail.m4 8.11 (Berkeley) 5/19/98')
+VERSIONID(`@(#)local_procmail.m4 8.11 (Berkeley) 5/19/1998')
divert(-1)
define(`LOCAL_MAILER_PATH',
diff --git a/contrib/sendmail/cf/feature/loose_relay_check.m4 b/contrib/sendmail/cf/feature/loose_relay_check.m4
index 6e3584b02ed8..988e44144f6a 100644
--- a/contrib/sendmail/cf/feature/loose_relay_check.m4
+++ b/contrib/sendmail/cf/feature/loose_relay_check.m4
@@ -9,7 +9,7 @@ divert(-1)
#
divert(0)
-VERSIONID(`@(#)loose_relay_check.m4 8.3 (Berkeley) 5/19/98')
+VERSIONID(`@(#)loose_relay_check.m4 8.3 (Berkeley) 5/19/1998')
divert(-1)
define(`_LOOSE_RELAY_CHECK_', 1)
diff --git a/contrib/sendmail/cf/feature/mailertable.m4 b/contrib/sendmail/cf/feature/mailertable.m4
index 3078261a452c..71a41adf3a75 100644
--- a/contrib/sendmail/cf/feature/mailertable.m4
+++ b/contrib/sendmail/cf/feature/mailertable.m4
@@ -12,7 +12,11 @@ divert(-1)
#
divert(0)
-VERSIONID(`@(#)mailertable.m4 8.9 (Berkeley) 5/19/98')
+VERSIONID(`@(#)mailertable.m4 8.10 (Berkeley) 10/6/1998')
divert(-1)
-define(`MAILER_TABLE', ifelse(_ARG_, `', DATABASE_MAP_TYPE` -o /etc/mailertable', `_ARG_'))dnl
+define(`MAILER_TABLE', ifelse(_ARG_, `',
+ ifdef(`_USE_ETC_MAIL_',
+ DATABASE_MAP_TYPE` -o /etc/mail/mailertable',
+ DATABASE_MAP_TYPE` -o /etc/mailertable'),
+ `_ARG_'))dnl
diff --git a/contrib/sendmail/cf/feature/masquerade_entire_domain.m4 b/contrib/sendmail/cf/feature/masquerade_entire_domain.m4
index 9766ae4499a0..4455b9a70851 100644
--- a/contrib/sendmail/cf/feature/masquerade_entire_domain.m4
+++ b/contrib/sendmail/cf/feature/masquerade_entire_domain.m4
@@ -12,7 +12,7 @@ divert(-1)
#
divert(0)
-VERSIONID(`@(#)masquerade_entire_domain.m4 8.6 (Berkeley) 5/19/98')
+VERSIONID(`@(#)masquerade_entire_domain.m4 8.6 (Berkeley) 5/19/1998')
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 75d257e64f5d..276c7f41d40c 100644
--- a/contrib/sendmail/cf/feature/masquerade_envelope.m4
+++ b/contrib/sendmail/cf/feature/masquerade_envelope.m4
@@ -12,7 +12,7 @@ divert(-1)
#
divert(0)
-VERSIONID(`@(#)masquerade_envelope.m4 8.6 (Berkeley) 5/19/98')
+VERSIONID(`@(#)masquerade_envelope.m4 8.6 (Berkeley) 5/19/1998')
divert(-1)
define(`_MASQUERADE_ENVELOPE_', 1)
diff --git a/contrib/sendmail/cf/feature/nocanonify.m4 b/contrib/sendmail/cf/feature/nocanonify.m4
index 6211a8ebec55..279a8eaae1bc 100644
--- a/contrib/sendmail/cf/feature/nocanonify.m4
+++ b/contrib/sendmail/cf/feature/nocanonify.m4
@@ -12,7 +12,7 @@ divert(-1)
#
divert(0)
-VERSIONID(`@(#)nocanonify.m4 8.6 (Berkeley) 5/19/98')
+VERSIONID(`@(#)nocanonify.m4 8.6 (Berkeley) 5/19/1998')
divert(-1)
define(`_NO_CANONIFY_', 1)
diff --git a/contrib/sendmail/cf/feature/nodns.m4 b/contrib/sendmail/cf/feature/nodns.m4
index 26458fc3af89..5d383d5475e7 100644
--- a/contrib/sendmail/cf/feature/nodns.m4
+++ b/contrib/sendmail/cf/feature/nodns.m4
@@ -12,10 +12,10 @@ divert(-1)
#
divert(0)
-VERSIONID(`@(#)nodns.m4 8.8 (Berkeley) 5/19/98')
+VERSIONID(`@(#)nodns.m4 8.9 (Berkeley) 10/6/1998')
divert(-1)
undefine(`confBIND_OPTS')dnl
errprint(`FEATURE(nodns) is no-op.
-Use ServiceSwitchFile ('ifdef(`confSERVICE_SWITCH_FILE',confSERVICE_SWITCH_FILE,`/etc/service.switch' if your OS does not provide its own)`) instead.
+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.
')
diff --git a/contrib/sendmail/cf/feature/notsticky.m4 b/contrib/sendmail/cf/feature/notsticky.m4
index 4fa344d70696..5ba6b2f70ce1 100644
--- a/contrib/sendmail/cf/feature/notsticky.m4
+++ b/contrib/sendmail/cf/feature/notsticky.m4
@@ -12,7 +12,7 @@ divert(-1)
#
divert(0)
-VERSIONID(`@(#)notsticky.m4 8.8 (Berkeley) 5/19/98')
+VERSIONID(`@(#)notsticky.m4 8.8 (Berkeley) 5/19/1998')
#
# 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 3c1098cac4e6..7cf241f77f70 100644
--- a/contrib/sendmail/cf/feature/nouucp.m4
+++ b/contrib/sendmail/cf/feature/nouucp.m4
@@ -12,7 +12,7 @@ divert(-1)
#
divert(0)
-VERSIONID(`@(#)nouucp.m4 8.6 (Berkeley) 5/19/98')
+VERSIONID(`@(#)nouucp.m4 8.6 (Berkeley) 5/19/1998')
divert(-1)
define(`_NO_UUCP_', 1)
diff --git a/contrib/sendmail/cf/feature/nullclient.m4 b/contrib/sendmail/cf/feature/nullclient.m4
index 1df782e24dea..99346ae03153 100644
--- a/contrib/sendmail/cf/feature/nullclient.m4
+++ b/contrib/sendmail/cf/feature/nullclient.m4
@@ -23,7 +23,7 @@ POPDIVERT
# sendmail.
#
-VERSIONID(`@(#)nullclient.m4 8.12 (Berkeley) 5/19/98')
+VERSIONID(`@(#)nullclient.m4 8.12 (Berkeley) 5/19/1998')
PUSHDIVERT(6)
# hub host (to which all mail is sent)
diff --git a/contrib/sendmail/cf/feature/promiscuous_relay.m4 b/contrib/sendmail/cf/feature/promiscuous_relay.m4
index 975afab752d6..cc3dae62f639 100644
--- a/contrib/sendmail/cf/feature/promiscuous_relay.m4
+++ b/contrib/sendmail/cf/feature/promiscuous_relay.m4
@@ -9,7 +9,7 @@ divert(-1)
#
divert(0)
-VERSIONID(`@(#)promiscuous_relay.m4 8.7 (Berkeley) 5/19/98')
+VERSIONID(`@(#)promiscuous_relay.m4 8.7 (Berkeley) 5/19/1998')
divert(-1)
define(`_PROMISCUOUS_RELAY_', 1)
diff --git a/contrib/sendmail/cf/feature/rbl.m4 b/contrib/sendmail/cf/feature/rbl.m4
index a9251e049782..0284aa3cbd87 100644
--- a/contrib/sendmail/cf/feature/rbl.m4
+++ b/contrib/sendmail/cf/feature/rbl.m4
@@ -9,7 +9,7 @@ divert(-1)
#
divert(0)
-VERSIONID(`@(#)rbl.m4 8.8 (Berkeley) 5/19/98')
+VERSIONID(`@(#)rbl.m4 8.8 (Berkeley) 5/19/1998')
divert(-1)
define(`_RBL_', ifelse(_ARG_, `', `rbl.maps.vix.com', `_ARG_'))dnl
diff --git a/contrib/sendmail/cf/feature/redirect.m4 b/contrib/sendmail/cf/feature/redirect.m4
index 721d2260c284..a9b333ff1c88 100644
--- a/contrib/sendmail/cf/feature/redirect.m4
+++ b/contrib/sendmail/cf/feature/redirect.m4
@@ -12,7 +12,7 @@ divert(-1)
#
divert(0)
-VERSIONID(`@(#)redirect.m4 8.10 (Berkeley) 5/19/98')
+VERSIONID(`@(#)redirect.m4 8.10 (Berkeley) 5/19/1998')
divert(-1)
diff --git a/contrib/sendmail/cf/feature/relay_based_on_MX.m4 b/contrib/sendmail/cf/feature/relay_based_on_MX.m4
index 44d07116ceb0..f19e89b6d782 100644
--- a/contrib/sendmail/cf/feature/relay_based_on_MX.m4
+++ b/contrib/sendmail/cf/feature/relay_based_on_MX.m4
@@ -9,7 +9,7 @@ divert(-1)
#
divert(0)
-VERSIONID(`@(#)relay_based_on_MX.m4 8.7 (Berkeley) 5/19/98')
+VERSIONID(`@(#)relay_based_on_MX.m4 8.7 (Berkeley) 5/19/1998')
divert(-1)
define(`_RELAY_MX_SERVED_', 1)
diff --git a/contrib/sendmail/cf/feature/relay_entire_domain.m4 b/contrib/sendmail/cf/feature/relay_entire_domain.m4
index 823da1e50ff1..c932a70ab396 100644
--- a/contrib/sendmail/cf/feature/relay_entire_domain.m4
+++ b/contrib/sendmail/cf/feature/relay_entire_domain.m4
@@ -9,7 +9,7 @@ divert(-1)
#
divert(0)
-VERSIONID(`@(#)relay_entire_domain.m4 8.7 (Berkeley) 5/19/98')
+VERSIONID(`@(#)relay_entire_domain.m4 8.7 (Berkeley) 5/19/1998')
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 98f72c8f82d8..35f7ab528494 100644
--- a/contrib/sendmail/cf/feature/relay_hosts_only.m4
+++ b/contrib/sendmail/cf/feature/relay_hosts_only.m4
@@ -9,7 +9,7 @@ divert(-1)
#
divert(0)
-VERSIONID(`@(#)relay_hosts_only.m4 8.7 (Berkeley) 5/19/98')
+VERSIONID(`@(#)relay_hosts_only.m4 8.7 (Berkeley) 5/19/1998')
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 549bc9c74232..ab040f6c2ff3 100644
--- a/contrib/sendmail/cf/feature/relay_local_from.m4
+++ b/contrib/sendmail/cf/feature/relay_local_from.m4
@@ -9,7 +9,7 @@ divert(-1)
#
divert(0)
-VERSIONID(`@(#)relay_local_from.m4 8.2 (Berkeley) 5/19/98')
+VERSIONID(`@(#)relay_local_from.m4 8.2 (Berkeley) 5/19/1998')
divert(-1)
define(`_RELAY_LOCAL_FROM_', 1)
diff --git a/contrib/sendmail/cf/feature/smrsh.m4 b/contrib/sendmail/cf/feature/smrsh.m4
index 2c47632649b3..3b44fa88a67d 100644
--- a/contrib/sendmail/cf/feature/smrsh.m4
+++ b/contrib/sendmail/cf/feature/smrsh.m4
@@ -12,7 +12,7 @@ divert(-1)
#
divert(0)
-VERSIONID(`@(#)smrsh.m4 8.8 (Berkeley) 5/19/98')
+VERSIONID(`@(#)smrsh.m4 8.8 (Berkeley) 5/19/1998')
divert(-1)
ifdef(`_MAILER_local_',
diff --git a/contrib/sendmail/cf/feature/stickyhost.m4 b/contrib/sendmail/cf/feature/stickyhost.m4
index 8bbeb49cac62..1d0d1cd590e4 100644
--- a/contrib/sendmail/cf/feature/stickyhost.m4
+++ b/contrib/sendmail/cf/feature/stickyhost.m4
@@ -12,7 +12,7 @@ divert(-1)
#
divert(0)
-VERSIONID(`@(#)stickyhost.m4 8.6 (Berkeley) 5/19/98')
+VERSIONID(`@(#)stickyhost.m4 8.6 (Berkeley) 5/19/1998')
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 344d178504d1..924dd06e0c8f 100644
--- a/contrib/sendmail/cf/feature/use_ct_file.m4
+++ b/contrib/sendmail/cf/feature/use_ct_file.m4
@@ -12,7 +12,7 @@ divert(-1)
#
divert(0)
-VERSIONID(`@(#)use_ct_file.m4 8.6 (Berkeley) 5/19/98')
+VERSIONID(`@(#)use_ct_file.m4 8.6 (Berkeley) 5/19/1998')
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 9abf2c1b4992..5bbbf7b2b07b 100644
--- a/contrib/sendmail/cf/feature/use_cw_file.m4
+++ b/contrib/sendmail/cf/feature/use_cw_file.m4
@@ -12,7 +12,7 @@ divert(-1)
#
divert(0)
-VERSIONID(`@(#)use_cw_file.m4 8.6 (Berkeley) 5/19/98')
+VERSIONID(`@(#)use_cw_file.m4 8.6 (Berkeley) 5/19/1998')
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 1c6a33a81fa7..0c584aa2e59f 100644
--- a/contrib/sendmail/cf/feature/uucpdomain.m4
+++ b/contrib/sendmail/cf/feature/uucpdomain.m4
@@ -12,7 +12,11 @@ divert(-1)
#
divert(0)
-VERSIONID(`@(#)uucpdomain.m4 8.13 (Berkeley) 5/19/98')
+VERSIONID(`@(#)uucpdomain.m4 8.14 (Berkeley) 10/6/1998')
divert(-1)
-define(`UUDOMAIN_TABLE', ifelse(_ARG_, `', DATABASE_MAP_TYPE` -o /etc/uudomain', `_ARG_'))dnl
+define(`UUDOMAIN_TABLE', ifelse(_ARG_, `',
+ ifdef(`_USE_ETC_MAIL_',
+ DATABASE_MAP_TYPE` -o /etc/mail/uudomain',
+ DATABASE_MAP_TYPE` -o /etc/uudomain'),
+ `_ARG_'))dnl
diff --git a/contrib/sendmail/cf/feature/virtusertable.m4 b/contrib/sendmail/cf/feature/virtusertable.m4
index 337f635766c0..316f7ea61dcd 100644
--- a/contrib/sendmail/cf/feature/virtusertable.m4
+++ b/contrib/sendmail/cf/feature/virtusertable.m4
@@ -12,7 +12,11 @@ divert(-1)
#
divert(0)
-VERSIONID(`@(#)virtusertable.m4 8.7 (Berkeley) 5/19/98')
+VERSIONID(`@(#)virtusertable.m4 8.8 (Berkeley) 10/6/1998')
divert(-1)
-define(`VIRTUSER_TABLE', ifelse(_ARG_, `', DATABASE_MAP_TYPE` -o /etc/virtusertable', `_ARG_'))dnl
+define(`VIRTUSER_TABLE', ifelse(_ARG_, `',
+ ifdef(`_USE_ETC_MAIL_',
+ DATABASE_MAP_TYPE` -o /etc/mail/virtusertable',
+ DATABASE_MAP_TYPE` -o /etc/virtusertable'),
+ `_ARG_'))dnl
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-10 08:43:07 +0000