diff options
| author | peter <peter@FreeBSD.org> | 1999-01-12 12:26:57 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1999-01-12 12:26:57 +0000 |
| commit | 2a7bd60222ce3c09208a265ad3a5f1490ccb6768 (patch) | |
| tree | 8d45e99e5e320ab4e55408b355a04b2be475a0ed /contrib/sendmail/cf | |
| parent | 329949050501501c130d09efc3aee7c78c6d4f9c (diff) | |
| download | FreeBSD-src-2a7bd60222ce3c09208a265ad3a5f1490ccb6768.zip FreeBSD-src-2a7bd60222ce3c09208a265ad3a5f1490ccb6768.tar.gz | |
Import sendmail-8.9.2 onto vendor branch (update from 8.9.1)
Obtained from: ftp.sendamil.org
Diffstat (limited to 'contrib/sendmail/cf')
131 files changed, 403 insertions, 260 deletions
diff --git a/contrib/sendmail/cf/README b/contrib/sendmail/cf/README index df50c9d..46a9475 100644 --- a/contrib/sendmail/cf/README +++ b/contrib/sendmail/cf/README @@ -4,7 +4,7 @@ Eric Allman <eric@Sendmail.ORG> - @(#)README 8.174 (Berkeley) 6/30/98 + @(#)README 8.184 (Berkeley) 12/29/1998 This document describes the sendmail configuration files being used @@ -719,6 +719,9 @@ nullclient This is a special case -- it creates a stripped down they are qualified with the masquerade name, which defaults to the name of the hub machine). No mailers should be defined. No aliasing or forwarding is done. + Also, note that absolutely no anti-spam or anti-relaying + is done in a null client configuration. More information + can be found in the ANTI-SPAM CONFIGURATION CONTROL section. local_lmtp Use an LMTP capable local mailer. The argument to this feature is the pathname of an LMTP capable mailer. By @@ -783,14 +786,27 @@ relay_hosts_only relay_based_on_MX Turns on the ability to allow relaying based on the MX - records of the host portion of an incoming recipient. See + records of the host portion of an incoming recipient; that + is, if an MX record for host foo.com points to your site, + you will accept and relay mail addressed to foo.com. See description below for more information before using this - feature. + feature. Also, see the KNOWNBUGS entry regarding bestmx + map lookups. + + FEATURE(relay_based_on_MX) does not necessarily allow + routing of these messages which you expect to be allowed, + if route address syntax (or %-hack syntax) is used. If + this is a problem, add entries to the access-table or use + FEATURE(loose_relay_check). relay_local_from Allows relaying if the domain portion of the mail sender is a local host. This should only be used if absolutely - necessary as it opens a window for spammers. + necessary as it opens a window for spammers. Specifically, + they can send mail to your mail server that claims to be + from your domain (either directly or via a routed address), + and you will go ahead and relay it out to arbitrary hosts + on the Internet. accept_unqualified_senders Normally, MAIL FROM: commands in the SMTP session will be @@ -1203,7 +1219,8 @@ If you use FEATURE(relay_entire_domain) then any host in any of your local domains (that is, the $=m class) -will be relayed. +will be relayed (that is, you will accept mail either to or from any +host in your domain). You can also allow relaying based on the MX records of the host portion of an incoming recipient address by using @@ -1212,9 +1229,11 @@ portion of an incoming recipient address by using For example, if your server receives a recipient of user@domain.com and domain.com lists your server in its MX records, the mail will be -accepted. Note that this will stop spammers from using your host to -relay spam but it will not stop outsiders from using your server as a -relay for their site. Along the same lines, +accepted for relay to domain.com. Note that this will stop spammers +from using your host to relay spam but it will not stop outsiders from +using your server as a relay for their site (that is, they set up an +MX record pointing to your mail server, and you will relay mail addressed +to them without any prior arrangement). Along the same lines, FEATURE(relay_local_from) @@ -1265,28 +1284,39 @@ definition for the database; for example FEATURE(access_db, hash -o /etc/mail/access) +Remember, since /etc/mail/access is a database, after creating the text +file as described below, you must use makemap to create the database +map. For example: + +makemap hash /etc/mail/access < /etc/mail/access + The table itself uses e-mail addresses, domain names, and network numbers as keys. For example, spammer@aol.com REJECT cyberspammer.com REJECT - 206.117.147 REJECT + 192.168.212 REJECT would refuse mail from spammer@aol.com, any user from cyberspammer.com (or any host within the cyberspammer.com domain), and any host on the -206.117.147.* network. +192.168.212.* network. The value part of the map can contain: - OK accept mail even if other rules in the - running ruleset would reject it. - RELAY Allow domain to relay through your SMTP - server. RELAY also serves an implicit - OK for the other checks. - REJECT reject the sender/recipient with a general + OK Accept mail even if other rules in the + running ruleset would reject it, for example, + if the domain name is unresolvable. + RELAY Accept mail addressed to the indicated domain or + received from the indicated domain for relaying + through your SMTP server. RELAY also serves as + an implicit OK for the other checks. + REJECT Reject the sender or recipient with a general purpose message. - DISCARD discard the message completely using - the $#discard mailer + DISCARD Discard the message completely using the + $#discard mailer. This only works for sender + addresses (i.e., it indicates that you should + discard anything received from the indicated + domain). ### any text where ### is an RFC 821 compliant error code and "any text" is a message to return for the command. @@ -1333,7 +1363,15 @@ domains, or addresses in your domain which should not receive mail: This would prevent a recipient of badlocaluser@mydomain.com, any user at host.mydomain.com, and the single address -user@otherhost.mydomain.com from receiving mail. +user@otherhost.mydomain.com from receiving mail. Enabling this +feature will keep you from sending mails to all addresses that +have an error message or REJECT as value part in the access map. +Taking the example from above: + + spammer@aol.com REJECT + cyberspammer.com REJECT + +Mail can't be sent to spammer@aol.com or anyone at cyberspammer.com. There is also a ``Realtime Blackhole List'' run by the MAPS project at http://maps.vix.com/. This is a database maintained in DNS of @@ -1382,6 +1420,17 @@ a Message-ID: header: R< $+ @ $+ > $@ OK R$* $#error $: 553 Header Error +Users of FEATURE(nullclient) who desire to use the anti-spam and +anti-relaying capabilities should replace FEATURE(nullclient, mailhub) +with: + + undefine(`ALIAS_FILE') + define(`MAIL_HUB', `mailhub') + define(`SMART_HOST', `mailhub') + define(`confFORWARD_PATH', `') + +where mailhub is the fully qualified hostname for their mail server. + +--------------------------------+ | ADDING NEW MAILERS OR RULESETS | @@ -1712,7 +1761,7 @@ confAUTO_REBUILD AutoRebuildAliases file if needed. confERROR_MODE ErrorMode [print] Error message mode. confERROR_MESSAGE ErrorHeader [undefined] Error message header/file. -confSAVE_FROM_LINES SafeFromLine Save extra leading From_ lines. +confSAVE_FROM_LINES SaveFromLine Save extra leading From_ lines. confTEMP_FILE_MODE TempFileMode [0600] Temporary file mode. confMATCH_GECOS MatchGECOS [False] Match GECOS field. confMAX_HOP MaxHopCount [25] Maximum hop count. diff --git a/contrib/sendmail/cf/cf/Build b/contrib/sendmail/cf/cf/Build index 3efaffd..3a91477 100755 --- a/contrib/sendmail/cf/cf/Build +++ b/contrib/sendmail/cf/cf/Build @@ -7,7 +7,7 @@ # the sendmail distribution. # # -# @(#)Build 8.3 (Berkeley) 5/19/98 +# @(#)Build 8.3 (Berkeley) 5/19/1998 # # diff --git a/contrib/sendmail/cf/cf/Makefile b/contrib/sendmail/cf/cf/Makefile index 8b6fb4d..7d0f373 100644 --- a/contrib/sendmail/cf/cf/Makefile +++ b/contrib/sendmail/cf/cf/Makefile @@ -1,7 +1,7 @@ # # Makefile for configuration files. # -# @(#)Makefile 8.17 (Berkeley) 4/2/98 +# @(#)Makefile 8.17 (Berkeley) 4/2/1998 # # diff --git a/contrib/sendmail/cf/cf/chez.cs.mc b/contrib/sendmail/cf/cf/chez.cs.mc index 9858330..a5334b5 100644 --- a/contrib/sendmail/cf/cf/chez.cs.mc +++ b/contrib/sendmail/cf/cf/chez.cs.mc @@ -23,7 +23,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`@(#)chez.cs.mc 8.11 (Berkeley) 5/19/98') +VERSIONID(`@(#)chez.cs.mc 8.11 (Berkeley) 5/19/1998') OSTYPE(bsd4.4)dnl DOMAIN(CS.Berkeley.EDU)dnl define(`LOCAL_RELAY', vangogh.CS.Berkeley.EDU)dnl diff --git a/contrib/sendmail/cf/cf/clientproto.mc b/contrib/sendmail/cf/cf/clientproto.mc index f0a6ae7..b0fd9bd 100644 --- a/contrib/sendmail/cf/cf/clientproto.mc +++ b/contrib/sendmail/cf/cf/clientproto.mc @@ -27,7 +27,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`@(#)clientproto.mc 8.12 (Berkeley) 5/19/98') +VERSIONID(`@(#)clientproto.mc 8.12 (Berkeley) 5/19/1998') OSTYPE(unknown) FEATURE(nullclient, mailhost.$m) diff --git a/contrib/sendmail/cf/cf/cs-hpux10.mc b/contrib/sendmail/cf/cf/cs-hpux10.mc index 527f930..0be009c 100644 --- a/contrib/sendmail/cf/cf/cs-hpux10.mc +++ b/contrib/sendmail/cf/cf/cs-hpux10.mc @@ -22,7 +22,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`@(#)cs-hpux10.mc 8.10 (Berkeley) 5/19/98') +VERSIONID(`@(#)cs-hpux10.mc 8.10 (Berkeley) 5/19/1998') OSTYPE(hpux10)dnl DOMAIN(CS.Berkeley.EDU)dnl define(`MAIL_HUB', mailspool.CS.Berkeley.EDU)dnl diff --git a/contrib/sendmail/cf/cf/cs-hpux9.mc b/contrib/sendmail/cf/cf/cs-hpux9.mc index f655052..9b5edfe 100644 --- a/contrib/sendmail/cf/cf/cs-hpux9.mc +++ b/contrib/sendmail/cf/cf/cs-hpux9.mc @@ -22,7 +22,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`@(#)cs-hpux9.mc 8.11 (Berkeley) 5/19/98') +VERSIONID(`@(#)cs-hpux9.mc 8.11 (Berkeley) 5/19/1998') OSTYPE(hpux9)dnl DOMAIN(CS.Berkeley.EDU)dnl define(`MAIL_HUB', mailspool.CS.Berkeley.EDU)dnl diff --git a/contrib/sendmail/cf/cf/cs-osf1.mc b/contrib/sendmail/cf/cf/cs-osf1.mc index ba35c04..230023c 100644 --- a/contrib/sendmail/cf/cf/cs-osf1.mc +++ b/contrib/sendmail/cf/cf/cs-osf1.mc @@ -22,7 +22,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`@(#)cs-osf1.mc 8.10 (Berkeley) 5/19/98') +VERSIONID(`@(#)cs-osf1.mc 8.10 (Berkeley) 5/19/1998') OSTYPE(osf1)dnl DOMAIN(CS.Berkeley.EDU)dnl MAILER(local)dnl diff --git a/contrib/sendmail/cf/cf/cs-solaris2.mc b/contrib/sendmail/cf/cf/cs-solaris2.mc index 395d19f..03fd5e2 100644 --- a/contrib/sendmail/cf/cf/cs-solaris2.mc +++ b/contrib/sendmail/cf/cf/cs-solaris2.mc @@ -22,7 +22,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`@(#)cs-solaris2.mc 8.9 (Berkeley) 5/19/98') +VERSIONID(`@(#)cs-solaris2.mc 8.9 (Berkeley) 5/19/1998') OSTYPE(solaris2)dnl DOMAIN(CS.Berkeley.EDU)dnl MAILER(local)dnl diff --git a/contrib/sendmail/cf/cf/cs-sunos4.1.mc b/contrib/sendmail/cf/cf/cs-sunos4.1.mc index 45dcd12..3913639 100644 --- a/contrib/sendmail/cf/cf/cs-sunos4.1.mc +++ b/contrib/sendmail/cf/cf/cs-sunos4.1.mc @@ -22,7 +22,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`@(#)cs-sunos4.1.mc 8.10 (Berkeley) 5/19/98') +VERSIONID(`@(#)cs-sunos4.1.mc 8.10 (Berkeley) 5/19/1998') OSTYPE(sunos4.1)dnl DOMAIN(CS.Berkeley.EDU)dnl MAILER(local)dnl diff --git a/contrib/sendmail/cf/cf/cs-ultrix4.mc b/contrib/sendmail/cf/cf/cs-ultrix4.mc index f2a4b42..a12b989 100644 --- a/contrib/sendmail/cf/cf/cs-ultrix4.mc +++ b/contrib/sendmail/cf/cf/cs-ultrix4.mc @@ -22,7 +22,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`@(#)cs-ultrix4.mc 8.10 (Berkeley) 5/19/98') +VERSIONID(`@(#)cs-ultrix4.mc 8.10 (Berkeley) 5/19/1998') OSTYPE(ultrix4)dnl DOMAIN(CS.Berkeley.EDU)dnl MAILER(local)dnl diff --git a/contrib/sendmail/cf/cf/generic-bsd4.4.mc b/contrib/sendmail/cf/cf/generic-bsd4.4.mc index 106fa31..b097605 100644 --- a/contrib/sendmail/cf/cf/generic-bsd4.4.mc +++ b/contrib/sendmail/cf/cf/generic-bsd4.4.mc @@ -20,7 +20,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`@(#)generic-bsd4.4.mc 8.7 (Berkeley) 5/19/98') +VERSIONID(`@(#)generic-bsd4.4.mc 8.7 (Berkeley) 5/19/1998') OSTYPE(bsd4.4)dnl DOMAIN(generic)dnl MAILER(local)dnl diff --git a/contrib/sendmail/cf/cf/generic-hpux10.mc b/contrib/sendmail/cf/cf/generic-hpux10.mc index 1a7eda9..2000505 100644 --- a/contrib/sendmail/cf/cf/generic-hpux10.mc +++ b/contrib/sendmail/cf/cf/generic-hpux10.mc @@ -19,7 +19,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`@(#)generic-hpux10.mc 8.8 (Berkeley) 5/19/98') +VERSIONID(`@(#)generic-hpux10.mc 8.8 (Berkeley) 5/19/1998') OSTYPE(hpux10)dnl DOMAIN(generic)dnl MAILER(local)dnl diff --git a/contrib/sendmail/cf/cf/generic-hpux9.mc b/contrib/sendmail/cf/cf/generic-hpux9.mc index 6aaf3b6..531b4ee 100644 --- a/contrib/sendmail/cf/cf/generic-hpux9.mc +++ b/contrib/sendmail/cf/cf/generic-hpux9.mc @@ -19,7 +19,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`@(#)generic-hpux9.mc 8.8 (Berkeley) 5/19/98') +VERSIONID(`@(#)generic-hpux9.mc 8.8 (Berkeley) 5/19/1998') OSTYPE(hpux9)dnl DOMAIN(generic)dnl MAILER(local)dnl diff --git a/contrib/sendmail/cf/cf/generic-nextstep3.3.mc b/contrib/sendmail/cf/cf/generic-nextstep3.3.mc index 5c81faa..1511ce7 100644 --- a/contrib/sendmail/cf/cf/generic-nextstep3.3.mc +++ b/contrib/sendmail/cf/cf/generic-nextstep3.3.mc @@ -19,7 +19,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`@(#)generic-nextstep3.3.mc 8.7 (Berkeley) 5/19/98') +VERSIONID(`@(#)generic-nextstep3.3.mc 8.7 (Berkeley) 5/19/1998') OSTYPE(nextstep)dnl DOMAIN(generic)dnl MAILER(local)dnl diff --git a/contrib/sendmail/cf/cf/generic-osf1.mc b/contrib/sendmail/cf/cf/generic-osf1.mc index 2113b92..83858d1 100644 --- a/contrib/sendmail/cf/cf/generic-osf1.mc +++ b/contrib/sendmail/cf/cf/generic-osf1.mc @@ -19,7 +19,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`@(#)generic-osf1.mc 8.8 (Berkeley) 5/19/98') +VERSIONID(`@(#)generic-osf1.mc 8.8 (Berkeley) 5/19/1998') OSTYPE(osf1)dnl DOMAIN(generic)dnl MAILER(local)dnl diff --git a/contrib/sendmail/cf/cf/generic-solaris2.mc b/contrib/sendmail/cf/cf/generic-solaris2.mc index 1e1aa96..a696e01 100644 --- a/contrib/sendmail/cf/cf/generic-solaris2.mc +++ b/contrib/sendmail/cf/cf/generic-solaris2.mc @@ -19,7 +19,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`@(#)generic-solaris2.mc 8.8 (Berkeley) 5/19/98') +VERSIONID(`@(#)generic-solaris2.mc 8.8 (Berkeley) 5/19/1998') OSTYPE(solaris2)dnl DOMAIN(generic)dnl MAILER(local)dnl diff --git a/contrib/sendmail/cf/cf/generic-sunos4.1.mc b/contrib/sendmail/cf/cf/generic-sunos4.1.mc index 7e916c1..fc0de35 100644 --- a/contrib/sendmail/cf/cf/generic-sunos4.1.mc +++ b/contrib/sendmail/cf/cf/generic-sunos4.1.mc @@ -19,7 +19,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`@(#)generic-sunos4.1.mc 8.8 (Berkeley) 5/19/98') +VERSIONID(`@(#)generic-sunos4.1.mc 8.8 (Berkeley) 5/19/1998') OSTYPE(sunos4.1)dnl DOMAIN(generic)dnl MAILER(local)dnl diff --git a/contrib/sendmail/cf/cf/generic-ultrix4.mc b/contrib/sendmail/cf/cf/generic-ultrix4.mc index 8c900b8..6fed36e 100644 --- a/contrib/sendmail/cf/cf/generic-ultrix4.mc +++ b/contrib/sendmail/cf/cf/generic-ultrix4.mc @@ -19,7 +19,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`@(#)generic-ultrix4.mc 8.8 (Berkeley) 5/19/98') +VERSIONID(`@(#)generic-ultrix4.mc 8.8 (Berkeley) 5/19/1998') OSTYPE(ultrix4)dnl DOMAIN(generic)dnl MAILER(local)dnl diff --git a/contrib/sendmail/cf/cf/huginn.cs.mc b/contrib/sendmail/cf/cf/huginn.cs.mc index 949e917..a58d121 100644 --- a/contrib/sendmail/cf/cf/huginn.cs.mc +++ b/contrib/sendmail/cf/cf/huginn.cs.mc @@ -21,7 +21,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`@(#)huginn.cs.mc 8.12 (Berkeley) 5/19/98') +VERSIONID(`@(#)huginn.cs.mc 8.12 (Berkeley) 5/19/1998') OSTYPE(hpux9)dnl DOMAIN(CS.Berkeley.EDU)dnl MASQUERADE_AS(CS.Berkeley.EDU)dnl diff --git a/contrib/sendmail/cf/cf/knecht.mc b/contrib/sendmail/cf/cf/knecht.mc index 97e5e43..026c8fb 100644 --- a/contrib/sendmail/cf/cf/knecht.mc +++ b/contrib/sendmail/cf/cf/knecht.mc @@ -16,7 +16,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`@(#)knecht.mc 8.30 (Berkeley) 6/11/98') +VERSIONID(`@(#)knecht.mc 8.30 (Berkeley) 6/11/1998') OSTYPE(bsd4.4)dnl DOMAIN(generic)dnl define(`confFORWARD_PATH', `$z/.forward.$w:$z/.forward+$h:$z/.forward')dnl diff --git a/contrib/sendmail/cf/cf/mail.cs.mc b/contrib/sendmail/cf/cf/mail.cs.mc index 1ecf34e..8abd945 100644 --- a/contrib/sendmail/cf/cf/mail.cs.mc +++ b/contrib/sendmail/cf/cf/mail.cs.mc @@ -21,7 +21,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`@(#)mail.cs.mc 8.15 (Berkeley) 5/19/98') +VERSIONID(`@(#)mail.cs.mc 8.15 (Berkeley) 5/19/1998') OSTYPE(ultrix4)dnl DOMAIN(Berkeley.EDU)dnl MASQUERADE_AS(CS.Berkeley.EDU)dnl diff --git a/contrib/sendmail/cf/cf/mail.eecs.mc b/contrib/sendmail/cf/cf/mail.eecs.mc index 42d053d..6522141 100644 --- a/contrib/sendmail/cf/cf/mail.eecs.mc +++ b/contrib/sendmail/cf/cf/mail.eecs.mc @@ -21,7 +21,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`@(#)mail.eecs.mc 8.15 (Berkeley) 5/19/98') +VERSIONID(`@(#)mail.eecs.mc 8.15 (Berkeley) 5/19/1998') OSTYPE(ultrix4)dnl DOMAIN(EECS.Berkeley.EDU)dnl MASQUERADE_AS(EECS.Berkeley.EDU)dnl diff --git a/contrib/sendmail/cf/cf/mailspool.cs.mc b/contrib/sendmail/cf/cf/mailspool.cs.mc index 7ae62b2..08dcce6 100644 --- a/contrib/sendmail/cf/cf/mailspool.cs.mc +++ b/contrib/sendmail/cf/cf/mailspool.cs.mc @@ -23,7 +23,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`@(#)mailspool.cs.mc 8.9 (Berkeley) 5/19/98') +VERSIONID(`@(#)mailspool.cs.mc 8.9 (Berkeley) 5/19/1998') OSTYPE(sunos4.1)dnl DOMAIN(CS.Berkeley.EDU)dnl MAILER(local)dnl diff --git a/contrib/sendmail/cf/cf/python.cs.mc b/contrib/sendmail/cf/cf/python.cs.mc index 2cb111d..ddf4fc3 100644 --- a/contrib/sendmail/cf/cf/python.cs.mc +++ b/contrib/sendmail/cf/cf/python.cs.mc @@ -23,7 +23,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`@(#)python.cs.mc 8.9 (Berkeley) 5/19/98') +VERSIONID(`@(#)python.cs.mc 8.9 (Berkeley) 5/19/1998') OSTYPE(bsd4.4)dnl DOMAIN(CS.Berkeley.EDU)dnl define(`LOCAL_RELAY', vangogh.CS.Berkeley.EDU)dnl diff --git a/contrib/sendmail/cf/cf/s2k-osf1.mc b/contrib/sendmail/cf/cf/s2k-osf1.mc index 1c7b1cc..6f1099a 100644 --- a/contrib/sendmail/cf/cf/s2k-osf1.mc +++ b/contrib/sendmail/cf/cf/s2k-osf1.mc @@ -22,7 +22,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`@(#)s2k-osf1.mc 8.10 (Berkeley) 5/19/98') +VERSIONID(`@(#)s2k-osf1.mc 8.10 (Berkeley) 5/19/1998') OSTYPE(osf1)dnl DOMAIN(S2K.Berkeley.EDU)dnl MAILER(local)dnl diff --git a/contrib/sendmail/cf/cf/s2k-ultrix4.mc b/contrib/sendmail/cf/cf/s2k-ultrix4.mc index 06c70d4..db8e455 100644 --- a/contrib/sendmail/cf/cf/s2k-ultrix4.mc +++ b/contrib/sendmail/cf/cf/s2k-ultrix4.mc @@ -22,7 +22,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`@(#)s2k-ultrix4.mc 8.10 (Berkeley) 5/19/98') +VERSIONID(`@(#)s2k-ultrix4.mc 8.10 (Berkeley) 5/19/1998') OSTYPE(ultrix4)dnl DOMAIN(S2K.Berkeley.EDU)dnl MAILER(local)dnl diff --git a/contrib/sendmail/cf/cf/tcpproto.mc b/contrib/sendmail/cf/cf/tcpproto.mc index eb6eade..692a08f 100644 --- a/contrib/sendmail/cf/cf/tcpproto.mc +++ b/contrib/sendmail/cf/cf/tcpproto.mc @@ -25,7 +25,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`@(#)tcpproto.mc 8.10 (Berkeley) 5/19/98') +VERSIONID(`@(#)tcpproto.mc 8.10 (Berkeley) 5/19/1998') OSTYPE(unknown) FEATURE(nouucp) MAILER(local) diff --git a/contrib/sendmail/cf/cf/ucbarpa.mc b/contrib/sendmail/cf/cf/ucbarpa.mc index 925d47f..40bb6c2 100644 --- a/contrib/sendmail/cf/cf/ucbarpa.mc +++ b/contrib/sendmail/cf/cf/ucbarpa.mc @@ -20,7 +20,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`@(#)ucbarpa.mc 8.9 (Berkeley) 5/19/98') +VERSIONID(`@(#)ucbarpa.mc 8.9 (Berkeley) 5/19/1998') DOMAIN(CS.Berkeley.EDU)dnl OSTYPE(bsd4.4)dnl MAILER(local)dnl diff --git a/contrib/sendmail/cf/cf/ucbvax.mc b/contrib/sendmail/cf/cf/ucbvax.mc index 76027fb..2395f82 100644 --- a/contrib/sendmail/cf/cf/ucbvax.mc +++ b/contrib/sendmail/cf/cf/ucbvax.mc @@ -21,7 +21,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`@(#)ucbvax.mc 8.11 (Berkeley) 5/19/98') +VERSIONID(`@(#)ucbvax.mc 8.11 (Berkeley) 5/19/1998') OSTYPE(bsd4.3) DOMAIN(CS.Berkeley.EDU) MASQUERADE_AS(CS.Berkeley.EDU) diff --git a/contrib/sendmail/cf/cf/uucpproto.mc b/contrib/sendmail/cf/cf/uucpproto.mc index 4f1c54a..a547d10 100644 --- a/contrib/sendmail/cf/cf/uucpproto.mc +++ b/contrib/sendmail/cf/cf/uucpproto.mc @@ -25,7 +25,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`@(#)uucpproto.mc 8.12 (Berkeley) 5/19/98') +VERSIONID(`@(#)uucpproto.mc 8.12 (Berkeley) 5/19/1998') OSTYPE(unknown) FEATURE(promiscuous_relay)dnl FEATURE(accept_unresolvable_domains)dnl diff --git a/contrib/sendmail/cf/cf/vangogh.cs.mc b/contrib/sendmail/cf/cf/vangogh.cs.mc index deefc29..f60dca7 100644 --- a/contrib/sendmail/cf/cf/vangogh.cs.mc +++ b/contrib/sendmail/cf/cf/vangogh.cs.mc @@ -22,7 +22,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`@(#)vangogh.cs.mc 8.10 (Berkeley) 5/19/98') +VERSIONID(`@(#)vangogh.cs.mc 8.10 (Berkeley) 5/19/1998') DOMAIN(CS.Berkeley.EDU)dnl OSTYPE(bsd4.4)dnl MAILER(local)dnl diff --git a/contrib/sendmail/cf/domain/Berkeley.EDU.m4 b/contrib/sendmail/cf/domain/Berkeley.EDU.m4 index 48e151b..85d5e5b 100644 --- a/contrib/sendmail/cf/domain/Berkeley.EDU.m4 +++ b/contrib/sendmail/cf/domain/Berkeley.EDU.m4 @@ -11,7 +11,7 @@ divert(-1) # # divert(0) -VERSIONID(`@(#)Berkeley.EDU.m4 8.14 (Berkeley) 5/19/98') +VERSIONID(`@(#)Berkeley.EDU.m4 8.14 (Berkeley) 5/19/1998') DOMAIN(berkeley-only)dnl define(`BITNET_RELAY', `bitnet-relay.Berkeley.EDU')dnl define(`UUCP_RELAY', `uucp-relay.Berkeley.EDU')dnl diff --git a/contrib/sendmail/cf/domain/CS.Berkeley.EDU.m4 b/contrib/sendmail/cf/domain/CS.Berkeley.EDU.m4 index 2030921..5609ce8 100644 --- a/contrib/sendmail/cf/domain/CS.Berkeley.EDU.m4 +++ b/contrib/sendmail/cf/domain/CS.Berkeley.EDU.m4 @@ -11,7 +11,7 @@ divert(-1) # # divert(0) -VERSIONID(`@(#)CS.Berkeley.EDU.m4 8.7 (Berkeley) 5/19/98') +VERSIONID(`@(#)CS.Berkeley.EDU.m4 8.7 (Berkeley) 5/19/1998') DOMAIN(Berkeley.EDU)dnl HACK(cssubdomain)dnl define(`confUSERDB_SPEC', diff --git a/contrib/sendmail/cf/domain/EECS.Berkeley.EDU.m4 b/contrib/sendmail/cf/domain/EECS.Berkeley.EDU.m4 index 022dddd..095fbc8 100644 --- a/contrib/sendmail/cf/domain/EECS.Berkeley.EDU.m4 +++ b/contrib/sendmail/cf/domain/EECS.Berkeley.EDU.m4 @@ -11,6 +11,6 @@ divert(-1) # # divert(0) -VERSIONID(`@(#)EECS.Berkeley.EDU.m4 8.7 (Berkeley) 5/19/98') +VERSIONID(`@(#)EECS.Berkeley.EDU.m4 8.7 (Berkeley) 5/19/1998') DOMAIN(Berkeley.EDU)dnl MASQUERADE_AS(EECS.Berkeley.EDU)dnl diff --git a/contrib/sendmail/cf/domain/S2K.Berkeley.EDU.m4 b/contrib/sendmail/cf/domain/S2K.Berkeley.EDU.m4 index 14965a6..a951f8b 100644 --- a/contrib/sendmail/cf/domain/S2K.Berkeley.EDU.m4 +++ b/contrib/sendmail/cf/domain/S2K.Berkeley.EDU.m4 @@ -11,6 +11,6 @@ divert(-1) # # divert(0) -VERSIONID(`@(#)S2K.Berkeley.EDU.m4 8.7 (Berkeley) 5/19/98') +VERSIONID(`@(#)S2K.Berkeley.EDU.m4 8.7 (Berkeley) 5/19/1998') DOMAIN(CS.Berkeley.EDU)dnl MASQUERADE_AS(postgres.Berkeley.EDU)dnl diff --git a/contrib/sendmail/cf/domain/berkeley-only.m4 b/contrib/sendmail/cf/domain/berkeley-only.m4 index d3d7708..805bab6 100644 --- a/contrib/sendmail/cf/domain/berkeley-only.m4 +++ b/contrib/sendmail/cf/domain/berkeley-only.m4 @@ -11,7 +11,7 @@ divert(-1) # # divert(0) -VERSIONID(`@(#)unspecified-domain.m4 8.7 (Berkeley) 5/19/98') +VERSIONID(`@(#)unspecified-domain.m4 8.7 (Berkeley) 5/19/1998') errprint(`*** ERROR: You are trying to use the Berkeley sample configuration') errprint(` files outside of the Computer Science Division at Berkeley.') errprint(` The configuration (.mc) files must be customized to reference') diff --git a/contrib/sendmail/cf/domain/generic.m4 b/contrib/sendmail/cf/domain/generic.m4 index 1329e44..93057d0 100644 --- a/contrib/sendmail/cf/domain/generic.m4 +++ b/contrib/sendmail/cf/domain/generic.m4 @@ -19,7 +19,7 @@ divert(-1) # files. # divert(0) -VERSIONID(`@(#)generic.m4 8.9 (Berkeley) 5/19/98') +VERSIONID(`@(#)generic.m4 8.9 (Berkeley) 5/19/1998') define(`confFORWARD_PATH', `$z/.forward.$w+$h:$z/.forward+$h:$z/.forward.$w:$z/.forward')dnl FEATURE(redirect)dnl FEATURE(use_cw_file)dnl diff --git a/contrib/sendmail/cf/feature/accept_unqualified_senders.m4 b/contrib/sendmail/cf/feature/accept_unqualified_senders.m4 index 16bef78..bf1b1e7 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 5b7241a..cbc4747 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 8582072..75b5551 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 42121e5..ed622dc 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 e609bf0..69092e3 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 2d30488..4064387 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 be5155b..7f9a181 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 4417fe0..e3478d3 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 0bf9f05..e7303dc 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 ec7a4d3..654db5d 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 ae5e868..b036ae1 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 f323b5b..f328ce5 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 adf1237..20618dd 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 6e3584b..988e441 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 3078261..71a41ad 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 9766ae4..4455b9a 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 75d257e..276c7f4 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 6211a8e..279a8ea 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 26458fc..5d383d5 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 4fa344d..5ba6b2f 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 3c1098c..7cf241f 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 1df782e..99346ae 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 975afab..cc3dae6 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 a9251e0..0284aa3 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 721d226..a9b333f 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 44d0711..f19e89b 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 823da1e..c932a70 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 98f72c8..35f7ab5 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 549bc9c..ab040f6 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 2c47632..3b44fa8 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 8bbeb49..1d0d1cd 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 344d178..924dd06 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 9abf2c1..5bbbf7b 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 1c6a33a..0c584aa 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 337f635..316f7ea 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 diff --git a/contrib/sendmail/cf/hack/cssubdomain.m4 b/contrib/sendmail/cf/hack/cssubdomain.m4 index b79b69b..6297d64 100644 --- a/contrib/sendmail/cf/hack/cssubdomain.m4 +++ b/contrib/sendmail/cf/hack/cssubdomain.m4 @@ -11,7 +11,7 @@ divert(-1) # # divert(0) -VERSIONID(`@(#)cssubdomain.m4 8.6 (Berkeley) 5/19/98') +VERSIONID(`@(#)cssubdomain.m4 8.6 (Berkeley) 5/19/1998') divert(2) # find possible (old & new) versions of our name via short circuit hack diff --git a/contrib/sendmail/cf/m4/cf.m4 b/contrib/sendmail/cf/m4/cf.m4 index 2165582..0b05809 100644 --- a/contrib/sendmail/cf/m4/cf.m4 +++ b/contrib/sendmail/cf/m4/cf.m4 @@ -25,4 +25,4 @@ ifdef(`_CF_DIR_', `', divert(0)dnl ifdef(`OSTYPE', `dnl', `include(_CF_DIR_`'m4/cfhead.m4)dnl -VERSIONID(`@(#)cf.m4 8.29 (Berkeley) 5/19/98')') +VERSIONID(`@(#)cf.m4 8.29 (Berkeley) 5/19/1998')') diff --git a/contrib/sendmail/cf/m4/cfhead.m4 b/contrib/sendmail/cf/m4/cfhead.m4 index a7a1098..9a5ccd2 100644 --- a/contrib/sendmail/cf/m4/cfhead.m4 +++ b/contrib/sendmail/cf/m4/cfhead.m4 @@ -105,7 +105,7 @@ define(`_OPTINS', `ifdef(`$1', `$2$1$3')') m4wrap(`include(_CF_DIR_`m4/proto.m4')') # set up default values for options -define(`ALIAS_FILE', `/etc/aliases') +define(`ALIAS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/aliases', `/etc/aliases')) define(`confMAILER_NAME', ``MAILER-DAEMON'') define(`confFROM_LINE', `From $g $d') define(`confOPERATORS', `.:%@!^/[]+') @@ -133,10 +133,10 @@ define(`confSAFE_QUEUE', `True') define(`confTO_QUEUERETURN', `5d') define(`confTO_QUEUEWARN', `4h') define(`confTIME_ZONE', `USE_SYSTEM') -define(`confCW_FILE', `/etc/sendmail.cw') +define(`confCW_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/local-host-names', `/etc/sendmail.cw')) define(`confMIME_FORMAT_ERRORS', `True') define(`confFORWARD_PATH', `$z/.forward.$w:$z/.forward') define(`confCR_FILE', `-o /etc/mail/relay-domains') divert(0)dnl -VERSIONID(`@(#)cfhead.m4 8.22 (Berkeley) 5/19/98') +VERSIONID(`@(#)cfhead.m4 8.23 (Berkeley) 10/6/1998') diff --git a/contrib/sendmail/cf/m4/nullrelay.m4 b/contrib/sendmail/cf/m4/nullrelay.m4 index 0202069..b71fd57 100644 --- a/contrib/sendmail/cf/m4/nullrelay.m4 +++ b/contrib/sendmail/cf/m4/nullrelay.m4 @@ -12,7 +12,7 @@ divert(-1) # divert(0) -VERSIONID(`@(#)nullrelay.m4 8.19 (Berkeley) 5/19/98') +VERSIONID(`@(#)nullrelay.m4 8.19 (Berkeley) 5/19/1998') # # This configuration applies only to relay-only hosts. They send diff --git a/contrib/sendmail/cf/m4/proto.m4 b/contrib/sendmail/cf/m4/proto.m4 index d8842bf..8e79454 100644 --- a/contrib/sendmail/cf/m4/proto.m4 +++ b/contrib/sendmail/cf/m4/proto.m4 @@ -12,12 +12,12 @@ divert(-1) # divert(0) -VERSIONID(`@(#)proto.m4 8.223 (Berkeley) 6/30/98') +VERSIONID(`@(#)proto.m4 8.237 (Berkeley) 12/17/1998') MAILER(local)dnl # level 8 config file format -V8/Berkeley +V8/ifdef(`VENDOR_NAME', `VENDOR_NAME', `Berkeley') divert(-1) # do some sanity checking @@ -220,7 +220,7 @@ ifdef(`_NULL_CLIENT_ONLY_', `dnl', ` _OPTION(AliasWait, `confALIAS_WAIT', 5m) # location of alias file -_OPTION(AliasFile, `ALIAS_FILE', /etc/aliases) +_OPTION(AliasFile, `ALIAS_FILE', ifdef(`_USE_ETC_MAIL_', /etc/mail/aliases, /etc/aliases)) ') # minimum number of free blocks on filesystem _OPTION(MinFreeBlocks, `confMIN_FREE_BLOCKS', 100) @@ -244,7 +244,7 @@ _OPTION(DeliveryMode, `confDELIVERY_MODE', background) _OPTION(AutoRebuildAliases, `confAUTO_REBUILD') # error message header/file -_OPTION(ErrorHeader, `confERROR_MESSAGE', /etc/sendmail.oE) +_OPTION(ErrorHeader, `confERROR_MESSAGE', ifdef(`_USE_ETC_MAIL_', /etc/mail/error-header, /etc/sendmail.oE)) # error mode _OPTION(ErrorMode, `confERROR_MODE', print) @@ -262,7 +262,7 @@ _OPTION(MatchGECOS, `confMATCH_GECOS') _OPTION(MaxHopCount, `confMAX_HOP', 17) # location of help file -O HelpFile=ifdef(`HELP_FILE', HELP_FILE, /usr/lib/sendmail.hf) +O HelpFile=ifdef(`HELP_FILE', HELP_FILE, ifdef(`_USE_ETC_MAIL_', /etc/mail/helpfile, /usr/lib/sendmail.hf)) # ignore dots as terminators in incoming messages? _OPTION(IgnoreDots, `confIGNORE_DOTS') @@ -351,7 +351,7 @@ _OPTION(DontPruneRoutes, `confDONT_PRUNE_ROUTES') _OPTION(SuperSafe, `confSAFE_QUEUE') # status file -O StatusFile=ifdef(`STATUS_FILE', `STATUS_FILE', /etc/sendmail.st) +O StatusFile=ifdef(`STATUS_FILE', `STATUS_FILE', ifdef(`_USE_ETC_MAIL_', /etc/mail/statistics, /etc/sendmail.st)) # time zone handling: # if undefined, use system default @@ -365,7 +365,7 @@ ifelse(confTIME_ZONE, `USE_SYSTEM', `#O TimeZoneSpec=', _OPTION(DefaultUser, `confDEF_USER_ID', mailnull) # list of locations of user database file (null means no lookup) -_OPTION(UserDatabaseSpec, `confUSERDB_SPEC', /etc/userdb) +_OPTION(UserDatabaseSpec, `confUSERDB_SPEC', ifdef(`_USE_ETC_MAIL_', /etc/mail/userdb, /etc/userdb)) # fallback MX host _OPTION(FallbackMXhost, `confFALLBACK_MX', fall.back.host.net) @@ -407,7 +407,7 @@ _OPTION(MinQueueAge, `confMIN_QUEUE_AGE', 30m) _OPTION(DefaultCharSet, `confDEF_CHAR_SET', iso-8859-1) # service switch file (ignored on Solaris, Ultrix, OSF/1, others) -_OPTION(ServiceSwitchFile, `confSERVICE_SWITCH_FILE', /etc/service.switch) +_OPTION(ServiceSwitchFile, `confSERVICE_SWITCH_FILE', ifdef(`_USE_ETC_MAIL_', /etc/mail/service.switch, /etc/service.switch)) # hosts file (normally /etc/hosts) _OPTION(HostsFile, `confHOSTS_FILE', /etc/hosts) @@ -466,6 +466,19 @@ _OPTION(MaxRecipientsPerMessage, `confMAX_RCPTS_PER_MESSAGE', 100) # shall we get local names from our installed interfaces? _OPTION(DontProbeInterfaces, `confDONT_PROBE_INTERFACES') +ifdef(`confTRUSTED_USER', +`# Trusted user for file ownership and starting the daemon +O TrustedUser=confTRUSTED_USER +') +ifdef(`confCONTROL_SOCKET_NAME', +`# Control socket for daemon management +O ControlSocketName=confCONTROL_SOCKET_NAME +') +ifdef(`confMAX_MIME_HEADER_LENGTH', +`# Maximum MIME header length to protect MUAs +O MaxMimeHeaderLength=confMAX_MIME_HEADER_LENGTH +') + ########################### # Message precedences # ########################### @@ -481,7 +494,7 @@ Pjunk=-100 ##################### # this is equivalent to setting class "t" -ifdef(`_USE_CT_FILE_', `', `#')Ft`'ifdef(`confCT_FILE', confCT_FILE, `/etc/sendmail.ct') +ifdef(`_USE_CT_FILE_', `', `#')Ft`'ifdef(`confCT_FILE', confCT_FILE, ifdef(`_USE_ETC_MAIL_', `/etc/mail/trusted-users', `/etc/sendmail.ct')) Troot Tdaemon ifdef(`_NO_UUCP_', `dnl', `Tuucp') @@ -827,7 +840,7 @@ R$* < @ $* > $* $: $>95 < $S > $1 < @ $2 > $3 glue on smarthost name # deal with other remote names ifdef(`_MAILER_smtp_', `R$* < @$* > $* $#_SMTP_ $@ $2 $: $1 < @ $2 > $3 user@host.domain', -`R$* < @$* > $* $#error $@ 5.1.2 $: "Unrecognized host name" $2') +`R$* < @$* > $* $#error $@ 5.1.2 $: "Unrecognized host name " $2') # handle locally delivered names R$=L $#_LOCAL_ $: @ $1 special local names @@ -965,7 +978,7 @@ ifdef(`_MASQUERADE_ENVELOPE_', S98 undivert(3)dnl -ifelse(confDELIVERY_MODE, defer, `errprint(`WARNING: Antispam rules not available in deferred delivery mode.')') +ifelse(substr(confDELIVERY_MODE,0,1), `d', `errprint(`WARNING: Antispam rules not available in deferred delivery mode.')') ifdef(`ACCESS_TABLE', `dnl ###################################################################### ### LookUpDomain -- search for domain in access database @@ -999,6 +1012,24 @@ R<$*> <$+> <$+> <$*> $@ <$1> <$4>', `dnl') ###################################################################### +### CanonAddr -- Convert an address into a standard form for +### relay checking. Route address syntax is +### crudely converted into a %-hack address. +### +### Parameters: +### $1 -- full recipient address +### +### Returns: +### parsed address, not in source route form +###################################################################### + +SCanonAddr +R$* $: $>Parse0 $>3 $1 make domain canonical +R< @ $+ > : $* @ $* < @ $1 > : $2 % $3 change @ to % in src route +R$* < @ $+ > : $* : $* $3 $1 < @ $2 > : $4 change to % hack. +R$* < @ $+ > : $* $3 $1 < @ $2 > + +###################################################################### ### ParseRecipient -- Strip off hosts in $=R as well as possibly ### $* $=m or the access database. ### Check user portion for host separators. @@ -1011,27 +1042,35 @@ R<$*> <$+> <$+> <$*> $@ <$1> <$4>', ###################################################################### SParseRecipient -R$* $: <?> $>Parse0 $>3 $1 -R<?> $* < @ $* . > <?> $1 < @ $2 > strip trailing dots -R<?> $- < @ $* > $: <?> $(dequote $1 $) < @ $2 > dequote local part +R$* $: <?> $>CanonAddr $1 +R<?> $* < @ $* . > <?> $1 < @ $2 > strip trailing dots +R<?> $- < @ $* > $: <?> $(dequote $1 $) < @ $2 > dequote local part # if no $=O character, no host in the user portion, we are done -R<?> $* $=O $* < @ $* > $: <NO> $1 $2 $3 < @ $4> -R<?> $* $@ $1 +R<?> $* $=O $* < @ $* > $: <NO> $1 $2 $3 < @ $4> +R<?> $* $@ $1 ifdef(`_RELAY_ENTIRE_DOMAIN_', `dnl # if we relay, check username portion for user%host so host can be checked also -R<NO> $* < @ $* $=m > $: <RELAY> $1 < @ $2 $3 >', `dnl') +R<NO> $* < @ $* $=m > $: <RELAY> $1 < @ $2 $3 >', `dnl') + +ifdef(`_RELAY_MX_SERVED_', `dnl +R<NO> $* < @ $+ > $: <MX> < : $(mxserved $2 $) : > < $1 < @$2 > > +R<MX> < : $* <TEMP> : > $* $#error $@ 4.7.1 $: "450 Can not check MX records for recipient host " $1 +R<MX> < $* : $=w. : $* > < $+ > $: <RELAY> $4 +R<MX> < : $* : > < $+ > $: <NO> $2', `dnl') + ifdef(`_RELAY_HOSTS_ONLY_', -`R<NO> $* < @ $=R > $: <RELAY> $1 < @ $2 > +`R<NO> $* < @ $=R > $: <RELAY> $1 < @ $2 > ifdef(`ACCESS_TABLE', `dnl -R<NO> $* < @ $* > $: <$(access $2 $: NO $)> $1 < @ $2 >',`dnl')', -`R<NO> $* < @ $* $=R > $: <RELAY> $1 < @ $2 $3 > +R<NO> $* < @ $+ > $: <$(access $2 $: NO $)> $1 < @ $2 >',`dnl')', +`R<NO> $* < @ $* $=R > $: <RELAY> $1 < @ $2 $3 > ifdef(`ACCESS_TABLE', `dnl -R<NO> $* < @ $* > $: $>LookUpDomain <$2> <NO> <$1 < @ $2 >> -R<$+> <$+> $: <$1> $2',`dnl')') -R<RELAY> $* < @ $* > $@ $>ParseRecipient $1 -R<$-> $* $@ $2 +R<NO> $* < @ $+ > $: $>LookUpDomain <$2> <NO> <$1 < @ $2 >> +R<$+> <$+> $: <$1> $2',`dnl')') + +R<RELAY> $* < @ $* > $@ $>ParseRecipient $1 +R<$-> $* $@ $2 ###################################################################### ### check_relay -- check hostname/address on SMTP startup @@ -1051,19 +1090,20 @@ R< $* > $* $: $2 ifdef(`ACCESS_TABLE', `dnl R$+ $| $+ $: $>LookUpDomain < $1 > <?> < $2 > -R<?> < $+ > $: $>LookUpAddress < $1 > <OK> < $1 > -R<OK> < $* > $: $1 -R<RELAY> < $* > $: $1 +R<?> < $+ > $: $>LookUpAddress < $1 > <?> < $1 > +R<?> < $+ > $: $1 +R<OK> < $* > $@ OK +R<RELAY> < $* > $@ RELAY R<REJECT> $* $#error $@ 5.7.1 $: "ifdef(`confREJECT_MSG', `confREJECT_MSG', `550 Access denied')" R<DISCARD> $* $#discard $: discard R<$+> $* $#error $@ 5.7.1 $: $1', `dnl') ifdef(`_RBL_', `dnl -# MAPS project checks -- http://maps.vix.com/ +# DNS based IP address spam lists R$* $: $&{client_addr} R$-.$-.$-.$- $: $(host $4.$3.$2.$1._RBL_. $: OK $) ROK $@ OK -R$+ $#error $@ 5.7.1 $: "Mail from " $&{client_addr} " refused; see http://maps.vix.com/rbl/"', +R$+ $#error $@ 5.7.1 $: "Mail from " $&{client_addr} " refused by blackhole site _RBL_"', `dnl') ###################################################################### @@ -1083,8 +1123,8 @@ R< d > $* $@ deferred R< $* > $* $: $2 R<> $@ <OK> -R$* $: <?> $>Parse0 $>3 $1 make domain canonical -R<?> $* < @ $+ . > $* <?> $1 < @ $2 > $3 strip trailing dots +R$* $: <?> $>CanonAddr $1 +R<?> $* < @ $+ . > <?> $1 < @ $2 > strip trailing dots # handle non-DNS hostnames (*.bitnet, *.decnet, *.uucp, etc) R<?> $* < $* $=P > $* $: <OK> $1 < @ $2 $3 > $4 ifdef(`_ACCEPT_UNRESOLVABLE_DOMAINS_', @@ -1158,10 +1198,21 @@ R< d > $* $@ deferred R< $* > $* $: $2 ifdef(`_LOOSE_RELAY_CHECK_',`dnl -R$* $: $>Parse0 $>3 $1 +R$* $: $>CanonAddr $1 R$* < @ $* . > $1 < @ $2 > strip trailing dots', `R$* $: $>ParseRecipient $1 strip relayable hosts') +ifdef(`_BESTMX_IS_LOCAL_',`dnl +ifelse(_BESTMX_IS_LOCAL_, `', `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 . > $* $@ $>Basic_check_rcpt $1 $2 $3 +R$* < @ $* @@ $=w . > $* $: $1 < @ $3 > $4 +R$* < @ $* @@ $* > $* $: $1 < @ $2 > $4') + ifdef(`_BLACKLIST_RCPT_',`dnl ifdef(`ACCESS_TABLE', `dnl # blacklist local users or any host from receiving mail @@ -1201,12 +1252,12 @@ ifdef(`_RELAY_MX_SERVED_', `dnl R$+ < @ $* > $: < : $(mxserved $2 $) : > $1 < @ $2 > R< : $* <TEMP> : > $* $#error $@ 4.7.1 $: "450 Can not check MX records for recipient host " $1 R<$* : $=w . : $*> $* $@ OK -R<$*> $* $: $2', +R< : $* : > $* $: $2', `dnl') # check for local user (i.e. unqualified address) R$* $: <?> $1 -R<?> $+ < @ $+ > $: <REMOTE> $1 < @ $2 > +R<?> $* < @ $+ > $: <REMOTE> $1 < @ $2 > # local user is ok R<?> $+ $@ OK R<$+> $* $: $2 @@ -1248,7 +1299,7 @@ R$=w $@ OK ... and see if it is local ifdef(`_RELAY_LOCAL_FROM_', `dnl # anything with a local FROM is ok -R$* $: $1 $| $>Parse0 $>3 $&f +R$* $: $1 $| $>CanonAddr $&f R$* $| $+ < @ $=w . > $@ OK FROM local R$* $| $* $: $1 ', `dnl') diff --git a/contrib/sendmail/cf/m4/version.m4 b/contrib/sendmail/cf/m4/version.m4 index 2db2202..6d03e37 100644 --- a/contrib/sendmail/cf/m4/version.m4 +++ b/contrib/sendmail/cf/m4/version.m4 @@ -10,8 +10,8 @@ divert(-1) # the sendmail distribution. # # -VERSIONID(`@(#)version.m4 8.9.1.1 (Berkeley) 7/2/98') +VERSIONID(`@(#)version.m4 8.9.2.1 (Berkeley) 12/29/1998') # divert(0) # Configuration version number -DZ8.9.1`'ifdef(`confCF_VERSION', `/confCF_VERSION') +DZ8.9.2`'ifdef(`confCF_VERSION', `/confCF_VERSION') diff --git a/contrib/sendmail/cf/mailer/cyrus.m4 b/contrib/sendmail/cf/mailer/cyrus.m4 index 6e4badc..567025f 100644 --- a/contrib/sendmail/cf/mailer/cyrus.m4 +++ b/contrib/sendmail/cf/mailer/cyrus.m4 @@ -47,7 +47,7 @@ POPDIVERT ### Cyrus Mailer specification ### ################################################## -VERSIONID(`@(#)cyrus.m4 8.9 (Carnegie Mellon) 5/19/98') +VERSIONID(`@(#)cyrus.m4 8.9 (Carnegie Mellon) 5/19/1998') Mcyrus, P=CYRUS_MAILER_PATH, F=CONCAT(`lsDFMnPq', CYRUS_MAILER_FLAGS), S=10, R=20/40, T=X-Unix, ifdef(`CYRUS_MAILER_MAX', `M=CYRUS_MAILER_MAX, ')U=CYRUS_MAILER_USER, diff --git a/contrib/sendmail/cf/mailer/fax.m4 b/contrib/sendmail/cf/mailer/fax.m4 index 581cfed..3ee94bd 100644 --- a/contrib/sendmail/cf/mailer/fax.m4 +++ b/contrib/sendmail/cf/mailer/fax.m4 @@ -26,7 +26,7 @@ POPDIVERT ### FAX Mailer specification ### #################################### -VERSIONID(`@(#)fax.m4 8.11 (Berkeley) 5/19/98') +VERSIONID(`@(#)fax.m4 8.11 (Berkeley) 5/19/1998') Mfax, P=FAX_MAILER_PATH, F=DFMhu, S=14, R=24, M=FAX_MAILER_MAX, T=X-Phone/X-FAX/X-Unix, A=FAX_MAILER_ARGS diff --git a/contrib/sendmail/cf/mailer/local.m4 b/contrib/sendmail/cf/mailer/local.m4 index 705e723..6b4b679 100644 --- a/contrib/sendmail/cf/mailer/local.m4 +++ b/contrib/sendmail/cf/mailer/local.m4 @@ -23,7 +23,7 @@ POPDIVERT ### Local and Program Mailer specification ### ################################################## -VERSIONID(`@(#)local.m4 8.30 (Berkeley) 6/30/98') +VERSIONID(`@(#)local.m4 8.30 (Berkeley) 6/30/1998') Mlocal, P=LOCAL_MAILER_PATH, F=CONCAT(`lsDFMAw5:/|@q', LOCAL_MAILER_FLAGS), S=10/30, R=20/40, _OPTINS(`LOCAL_MAILER_MAX', `M=', `, ')_OPTINS(`LOCAL_MAILER_CHARSET', `C=', `, ')T=DNS/RFC822/X-Unix, diff --git a/contrib/sendmail/cf/mailer/mail11.m4 b/contrib/sendmail/cf/mailer/mail11.m4 index 5c9d948..222b53f 100644 --- a/contrib/sendmail/cf/mailer/mail11.m4 +++ b/contrib/sendmail/cf/mailer/mail11.m4 @@ -40,7 +40,7 @@ POPDIVERT ### UTK-MAIL11 Mailer specification ### ########################################### -VERSIONID(`@(#)mail11.m4 8.8 (Berkeley) 5/19/98') +VERSIONID(`@(#)mail11.m4 8.8 (Berkeley) 5/19/1998') Mmail11, P=MAIL11_MAILER_PATH, F=MAIL11_MAILER_FLAGS, S=15, R=25, A=MAIL11_MAILER_ARGS diff --git a/contrib/sendmail/cf/mailer/phquery.m4 b/contrib/sendmail/cf/mailer/phquery.m4 index 5f1b6b4..3e0891a 100644 --- a/contrib/sendmail/cf/mailer/phquery.m4 +++ b/contrib/sendmail/cf/mailer/phquery.m4 @@ -23,7 +23,7 @@ POPDIVERT ### PH Mailer specification ### #################################### -VERSIONID(`@(#)phquery.m4 8.6 (Berkeley) 5/19/98') +VERSIONID(`@(#)phquery.m4 8.6 (Berkeley) 5/19/1998') Mph, P=PH_MAILER_PATH, F=CONCAT(`nrDFM', PH_MAILER_FLAGS), S=10, R=20/40, A=PH_MAILER_ARGS diff --git a/contrib/sendmail/cf/mailer/pop.m4 b/contrib/sendmail/cf/mailer/pop.m4 index a4f3128..0acea7d 100644 --- a/contrib/sendmail/cf/mailer/pop.m4 +++ b/contrib/sendmail/cf/mailer/pop.m4 @@ -21,7 +21,7 @@ POPDIVERT ### POP Mailer specification ### #################################### -VERSIONID(`@(#)pop.m4 8.11 (Berkeley) 5/19/98') +VERSIONID(`@(#)pop.m4 8.11 (Berkeley) 5/19/1998') Mpop, P=POP_MAILER_PATH, F=CONCAT(`lsDFMq', POP_MAILER_FLAGS), S=10, R=20/40, T=DNS/RFC822/X-Unix, A=POP_MAILER_ARGS diff --git a/contrib/sendmail/cf/mailer/procmail.m4 b/contrib/sendmail/cf/mailer/procmail.m4 index b6131c0..38b6d20 100644 --- a/contrib/sendmail/cf/mailer/procmail.m4 +++ b/contrib/sendmail/cf/mailer/procmail.m4 @@ -26,7 +26,7 @@ POPDIVERT ### PROCMAIL Mailer specification ### ##################*****################## -VERSIONID(`@(#)procmail.m4 8.11 (Berkeley) 5/19/98') +VERSIONID(`@(#)procmail.m4 8.11 (Berkeley) 5/19/1998') Mprocmail, P=PROCMAIL_MAILER_PATH, F=CONCAT(`DFM', PROCMAIL_MAILER_FLAGS), S=11/31, R=21/31, T=DNS/RFC822/X-Unix, ifdef(`PROCMAIL_MAILER_MAX', `M=PROCMAIL_MAILER_MAX, ')A=PROCMAIL_MAILER_ARGS diff --git a/contrib/sendmail/cf/mailer/smtp.m4 b/contrib/sendmail/cf/mailer/smtp.m4 index d70195e..7545597 100644 --- a/contrib/sendmail/cf/mailer/smtp.m4 +++ b/contrib/sendmail/cf/mailer/smtp.m4 @@ -22,7 +22,7 @@ POPDIVERT ### SMTP Mailer specification ### ##################################### -VERSIONID(`@(#)smtp.m4 8.38 (Berkeley) 5/19/98') +VERSIONID(`@(#)smtp.m4 8.38 (Berkeley) 5/19/1998') Msmtp, P=[IPC], F=CONCAT(mDFMuX, SMTP_MAILER_FLAGS), S=11/31, R=ifdef(`_ALL_MASQUERADE_', `21/31', `21'), E=\r\n, L=990, _OPTINS(`SMTP_MAILER_MAX', `M=', `, ')_OPTINS(`SMTP_MAILER_CHARSET', `C=', `, ')T=DNS/RFC822/SMTP, diff --git a/contrib/sendmail/cf/mailer/usenet.m4 b/contrib/sendmail/cf/mailer/usenet.m4 index 6c92f5f..1535751 100644 --- a/contrib/sendmail/cf/mailer/usenet.m4 +++ b/contrib/sendmail/cf/mailer/usenet.m4 @@ -19,7 +19,7 @@ POPDIVERT ### USENET Mailer specification ### #################################### -VERSIONID(`@(#)usenet.m4 8.10 (Berkeley) 5/19/98') +VERSIONID(`@(#)usenet.m4 8.10 (Berkeley) 5/19/1998') Musenet, P=USENET_MAILER_PATH, F=USENET_MAILER_FLAGS, S=10, R=20, _OPTINS(`USENET_MAILER_MAX', `M=', `, ')T=X-Usenet/X-Usenet/X-Unix, diff --git a/contrib/sendmail/cf/mailer/uucp.m4 b/contrib/sendmail/cf/mailer/uucp.m4 index cd2619d..badd307 100644 --- a/contrib/sendmail/cf/mailer/uucp.m4 +++ b/contrib/sendmail/cf/mailer/uucp.m4 @@ -22,7 +22,7 @@ POPDIVERT ### UUCP Mailer specification ### ##################################### -VERSIONID(`@(#)uucp.m4 8.30 (Berkeley) 5/19/98') +VERSIONID(`@(#)uucp.m4 8.30 (Berkeley) 5/19/1998') # # There are innumerable variations on the UUCP mailer. It really diff --git a/contrib/sendmail/cf/ostype/aix2.m4 b/contrib/sendmail/cf/ostype/aix2.m4 index 1e77c1c..2bda79c 100644 --- a/contrib/sendmail/cf/ostype/aix2.m4 +++ b/contrib/sendmail/cf/ostype/aix2.m4 @@ -12,7 +12,7 @@ divert(-1) # divert(0) -VERSIONID(`@(#)aix2.m4 8.8 (Berkeley) 5/19/98') +VERSIONID(`@(#)aix2.m4 8.8 (Berkeley) 5/19/1998') define(`LOCAL_MAILER_PATH', /bin/bellmail)dnl define(`LOCAL_MAILER_ARGS', mail $u)dnl define(`LOCAL_MAILER_FLAGS', `mn9')dnl diff --git a/contrib/sendmail/cf/ostype/aix3.m4 b/contrib/sendmail/cf/ostype/aix3.m4 index 2cfc8c5..fb74d9e 100644 --- a/contrib/sendmail/cf/ostype/aix3.m4 +++ b/contrib/sendmail/cf/ostype/aix3.m4 @@ -12,7 +12,7 @@ divert(-1) # divert(0) -VERSIONID(`@(#)aix3.m4 8.12 (Berkeley) 5/19/98') +VERSIONID(`@(#)aix3.m4 8.12 (Berkeley) 5/19/1998') ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', /bin/bellmail)')dnl ifdef(`LOCAL_MAILER_ARGS',, `define(`LOCAL_MAILER_ARGS', mail $u)')dnl ifdef(`LOCAL_MAILER_FLAGS',, `define(`LOCAL_MAILER_FLAGS', `mn9')')dnl diff --git a/contrib/sendmail/cf/ostype/aix4.m4 b/contrib/sendmail/cf/ostype/aix4.m4 index 06c7d1a..24ff001 100644 --- a/contrib/sendmail/cf/ostype/aix4.m4 +++ b/contrib/sendmail/cf/ostype/aix4.m4 @@ -12,7 +12,7 @@ divert(-1) # divert(0) -VERSIONID(`@(#)aix4.m4 8.7 (Berkeley) 5/19/98') +VERSIONID(`@(#)aix4.m4 8.7 (Berkeley) 5/19/1998') ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', /bin/bellmail)')dnl ifdef(`LOCAL_MAILER_ARGS',, `define(`LOCAL_MAILER_ARGS', mail -F $g $u)')dnl ifdef(`LOCAL_MAILER_FLAGS',, `define(`LOCAL_MAILER_FLAGS', `mn9')')dnl diff --git a/contrib/sendmail/cf/ostype/altos.m4 b/contrib/sendmail/cf/ostype/altos.m4 index 38a07a0..4dcefa9 100644 --- a/contrib/sendmail/cf/ostype/altos.m4 +++ b/contrib/sendmail/cf/ostype/altos.m4 @@ -14,11 +14,11 @@ divert(-1) # divert(0) -VERSIONID(`@(#)altos.m4 8.9 (Berkeley) 5/19/98') +VERSIONID(`@(#)altos.m4 8.10 (Berkeley) 10/6/1998') -define(`ALIAS_FILE', /usr/lib/mail/aliases)dnl +define(`ALIAS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/aliases', `/usr/lib/mail/aliases'))dnl ifdef(`QUEUE_DIR',, `define(`QUEUE_DIR', /usr/spool/mqueue)')dnl -ifdef(`STATUS_FILE',, `define(`STATUS_FILE', /usr/lib/sendmail.st)')dnl +ifdef(`STATUS_FILE',, `define(`STATUS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/statistics', `/usr/lib/sendmail.st'))')dnl ifdef(`UUCP_MAILER_PATH',, `define(`UUCP_MAILER_PATH', /usr/bin/uux)')dnl ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', /usr/bin/lmail)')dnl ifdef(`LOCAL_MAILER_FLAGS',, `define(`LOCAL_MAILER_FLAGS', mPuhCE9)')dnl diff --git a/contrib/sendmail/cf/ostype/amdahl-uts.m4 b/contrib/sendmail/cf/ostype/amdahl-uts.m4 index 022b507..84d47cd 100644 --- a/contrib/sendmail/cf/ostype/amdahl-uts.m4 +++ b/contrib/sendmail/cf/ostype/amdahl-uts.m4 @@ -12,12 +12,12 @@ divert(-1) # divert(0) -VERSIONID(`@(#)amdahl-uts.m4 8.10 (Berkeley) 5/19/98') +VERSIONID(`@(#)amdahl-uts.m4 8.11 (Berkeley) 10/6/1998') divert(-1) define(`ALIAS_FILE', /etc/mail/aliases) -ifdef(`HELP_FILE',, `define(`HELP_FILE', /etc/mail/sendmail.hf)') -ifdef(`STATUS_FILE',, `define(`STATUS_FILE', /usr/lib/sendmail.st)') +ifdef(`HELP_FILE',, `define(`HELP_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/helpfile', `/etc/mail/sendmail.hf'))') +ifdef(`STATUS_FILE',, `define(`STATUS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/statistics', `/usr/lib/sendmail.st'))') ifdef(`LOCAL_MAILER_FLAGS',, `define(`LOCAL_MAILER_FLAGS', `fSn9')') -define(`confCW_FILE', /etc/mail/sendmail.cw) +define(`confCW_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/local-host-names', `/etc/mail/sendmail.cw')) define(`confEBINDIR', `/usr/lib')dnl diff --git a/contrib/sendmail/cf/ostype/aux.m4 b/contrib/sendmail/cf/ostype/aux.m4 index 2adbfe4..8038cb5 100644 --- a/contrib/sendmail/cf/ostype/aux.m4 +++ b/contrib/sendmail/cf/ostype/aux.m4 @@ -12,10 +12,10 @@ divert(-1) # divert(0) -VERSIONID(`@(#)aux.m4 8.10 (Berkeley) 5/19/98') -define(`ALIAS_FILE', /usr/lib/aliases)dnl +VERSIONID(`@(#)aux.m4 8.11 (Berkeley) 10/6/1998') +define(`ALIAS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/aliases', `/usr/lib/aliases'))dnl ifdef(`QUEUE_DIR',, `define(`QUEUE_DIR', /usr/spool/mqueue)')dnl -ifdef(`STATUS_FILE',, `define(`STATUS_FILE', /usr/lib/sendmail.st)')dnl +ifdef(`STATUS_FILE',, `define(`STATUS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/statistics', `/usr/lib/sendmail.st'))')dnl ifdef(`UUCP_MAILER_PATH',, `define(`UUCP_MAILER_PATH', /usr/bin/uux)')dnl ifdef(`LOCAL_MAILER_FLAGS',, `define(`LOCAL_MAILER_FLAGS', mn9)')dnl ifdef(`LOCAL_MAILER_ARGS',, `define(`LOCAL_MAILER_ARGS', `mail -d -r $f $u')')dnl diff --git a/contrib/sendmail/cf/ostype/bsd4.3.m4 b/contrib/sendmail/cf/ostype/bsd4.3.m4 index 47c02cc..d0f3f8a 100644 --- a/contrib/sendmail/cf/ostype/bsd4.3.m4 +++ b/contrib/sendmail/cf/ostype/bsd4.3.m4 @@ -12,6 +12,6 @@ divert(-1) # divert(0) -VERSIONID(`@(#)bsd4.3.m4 8.9 (Berkeley) 5/19/98') +VERSIONID(`@(#)bsd4.3.m4 8.9 (Berkeley) 5/19/1998') ifdef(`QUEUE_DIR',, `define(`QUEUE_DIR', /usr/spool/mqueue)')dnl ifdef(`UUCP_MAILER_ARGS',, `define(`UUCP_MAILER_ARGS', `uux - -r -z -a$g $h!rmail ($u)')')dnl diff --git a/contrib/sendmail/cf/ostype/bsd4.4.m4 b/contrib/sendmail/cf/ostype/bsd4.4.m4 index c023de5..514bce8 100644 --- a/contrib/sendmail/cf/ostype/bsd4.4.m4 +++ b/contrib/sendmail/cf/ostype/bsd4.4.m4 @@ -13,8 +13,8 @@ divert(-1) # divert(0) -VERSIONID(`@(#)bsd4.4.m4 8.9 (Berkeley) 5/19/98') -ifdef(`HELP_FILE',, `define(`HELP_FILE', /usr/share/misc/sendmail.hf)')dnl -ifdef(`STATUS_FILE',, `define(`STATUS_FILE', /var/log/sendmail.st)')dnl +VERSIONID(`@(#)bsd4.4.m4 8.10 (Berkeley) 10/6/1998') +ifdef(`HELP_FILE',, `define(`HELP_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/helpfile', `/usr/share/misc/sendmail.hf'))')dnl +ifdef(`STATUS_FILE',, `define(`STATUS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/statistics', `/var/log/sendmail.st'))')dnl ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', /usr/libexec/mail.local)')dnl ifdef(`UUCP_MAILER_ARGS',, `define(`UUCP_MAILER_ARGS', `uux - -r -z -a$g $h!rmail ($u)')')dnl diff --git a/contrib/sendmail/cf/ostype/bsdi1.0.m4 b/contrib/sendmail/cf/ostype/bsdi1.0.m4 index 48d60b3..08bd2a5 100644 --- a/contrib/sendmail/cf/ostype/bsdi1.0.m4 +++ b/contrib/sendmail/cf/ostype/bsdi1.0.m4 @@ -12,5 +12,5 @@ divert(-1) # divert(0) -VERSIONID(`@(#)bsdi1.0.m4 8.7 (Berkeley) 5/19/98')dnl +VERSIONID(`@(#)bsdi1.0.m4 8.7 (Berkeley) 5/19/1998')dnl include(_CF_DIR_`'ostype/bsd4.4.m4)dnl diff --git a/contrib/sendmail/cf/ostype/bsdi2.0.m4 b/contrib/sendmail/cf/ostype/bsdi2.0.m4 index 73b0447..6883eb0 100644 --- a/contrib/sendmail/cf/ostype/bsdi2.0.m4 +++ b/contrib/sendmail/cf/ostype/bsdi2.0.m4 @@ -12,5 +12,5 @@ divert(-1) # divert(0) -VERSIONID(`@(#)bsdi2.0.m4 8.6 (Berkeley) 5/19/98')dnl +VERSIONID(`@(#)bsdi2.0.m4 8.6 (Berkeley) 5/19/1998')dnl include(_CF_DIR_`'ostype/bsd4.4.m4)dnl diff --git a/contrib/sendmail/cf/ostype/dgux.m4 b/contrib/sendmail/cf/ostype/dgux.m4 index eeb8c4d..2f25cd8 100644 --- a/contrib/sendmail/cf/ostype/dgux.m4 +++ b/contrib/sendmail/cf/ostype/dgux.m4 @@ -12,7 +12,7 @@ divert(-1) # divert(0) -VERSIONID(`@(#)dgux.m4 8.10 (Berkeley) 5/19/98') +VERSIONID(`@(#)dgux.m4 8.10 (Berkeley) 5/19/1998') ifdef(`LOCAL_MAILER_FLAGS',, `define(`LOCAL_MAILER_FLAGS', m9)')dnl define(`confTIME_ZONE', `USE_TZ')dnl define(`confEBINDIR', `/usr/lib')dnl diff --git a/contrib/sendmail/cf/ostype/domainos.m4 b/contrib/sendmail/cf/ostype/domainos.m4 index c03dee5..9f4ea92 100644 --- a/contrib/sendmail/cf/ostype/domainos.m4 +++ b/contrib/sendmail/cf/ostype/domainos.m4 @@ -12,10 +12,10 @@ divert(-1) # divert(0) -VERSIONID(`@(#)domainos.m4 8.9 (Berkeley) 5/19/98') +VERSIONID(`@(#)domainos.m4 8.10 (Berkeley) 10/6/1998') divert(-1) -define(`ALIAS_FILE', /usr/lib/aliases) -ifdef(`STATUS_FILE',, `define(`STATUS_FILE', /usr/lib/sendmail.st)') +define(`ALIAS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/aliases', `/usr/lib/aliases')) +ifdef(`STATUS_FILE',, `define(`STATUS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/statistics', `/usr/lib/sendmail.st'))') ifdef(`QUEUE_DIR',, `define(`QUEUE_DIR', /usr/spool/mqueue)') define(`confEBINDIR', `/usr/lib')dnl diff --git a/contrib/sendmail/cf/ostype/dynix3.2.m4 b/contrib/sendmail/cf/ostype/dynix3.2.m4 index 94d59b5..3836446 100644 --- a/contrib/sendmail/cf/ostype/dynix3.2.m4 +++ b/contrib/sendmail/cf/ostype/dynix3.2.m4 @@ -12,7 +12,7 @@ divert(-1) # divert(0) -VERSIONID(`@(#)dynix3.2.m4 8.9 (Berkeley) 5/19/98') -define(`ALIAS_FILE', /usr/lib/aliases)dnl +VERSIONID(`@(#)dynix3.2.m4 8.10 (Berkeley) 10/6/1998') +define(`ALIAS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/aliases', `/usr/lib/aliases'))dnl ifdef(`QUEUE_DIR',, `define(`QUEUE_DIR', /usr/spool/mqueue)')dnl define(`confEBINDIR', `/usr/lib')dnl diff --git a/contrib/sendmail/cf/ostype/gnuhurd.m4 b/contrib/sendmail/cf/ostype/gnuhurd.m4 index d7127f6..a8ed667 100644 --- a/contrib/sendmail/cf/ostype/gnuhurd.m4 +++ b/contrib/sendmail/cf/ostype/gnuhurd.m4 @@ -13,8 +13,8 @@ divert(-1) # divert(0) -VERSIONID(`@(#)gnuhurd.m4 8.7 (Berkeley) 5/19/98') -ifdef(`HELP_FILE',, `define(`HELP_FILE', /share/misc/sendmail.hf)')dnl -ifdef(`STATUS_FILE',, `define(`STATUS_FILE', /var/log/sendmail.st)')dnl +VERSIONID(`@(#)gnuhurd.m4 8.8 (Berkeley) 10/6/1998') +ifdef(`HELP_FILE',, `define(`HELP_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/helpfile', `/share/misc/sendmail.hf'))')dnl +ifdef(`STATUS_FILE',, `define(`STATUS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/statistics', `/var/log/sendmail.st'))')dnl ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', /libexec/mail.local)')dnl define(`confEBINDIR', `/libexec')dnl diff --git a/contrib/sendmail/cf/ostype/hpux10.m4 b/contrib/sendmail/cf/ostype/hpux10.m4 index 9499474..d349b54 100644 --- a/contrib/sendmail/cf/ostype/hpux10.m4 +++ b/contrib/sendmail/cf/ostype/hpux10.m4 @@ -12,12 +12,12 @@ divert(-1) # divert(0) -VERSIONID(`@(#)hpux10.m4 8.13 (Berkeley) 5/19/98') +VERSIONID(`@(#)hpux10.m4 8.14 (Berkeley) 10/6/1998') ifdef(`QUEUE_DIR',, `define(`QUEUE_DIR', /var/spool/mqueue)')dnl define(`ALIAS_FILE', /etc/mail/aliases)dnl -ifdef(`STATUS_FILE',, `define(`STATUS_FILE', /etc/mail/sendmail.st)')dnl -ifdef(`HELP_FILE',, `define(`HELP_FILE', /usr/share/lib/sendmail.hf)')dnl +ifdef(`STATUS_FILE',, `define(`STATUS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/statistics', `/etc/mail/sendmail.st'))')dnl +ifdef(`HELP_FILE',, `define(`HELP_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/helpfile', `/usr/share/lib/sendmail.hf'))')dnl ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', /usr/bin/rmail)')dnl ifdef(`LOCAL_MAILER_FLAGS',, `define(`LOCAL_MAILER_FLAGS', `m9')')dnl ifdef(`LOCAL_MAILER_ARGS',, `define(`LOCAL_MAILER_ARGS', `rmail -d $u')')dnl diff --git a/contrib/sendmail/cf/ostype/hpux9.m4 b/contrib/sendmail/cf/ostype/hpux9.m4 index 19579ca..55f1b97 100644 --- a/contrib/sendmail/cf/ostype/hpux9.m4 +++ b/contrib/sendmail/cf/ostype/hpux9.m4 @@ -12,11 +12,11 @@ divert(-1) # divert(0) -VERSIONID(`@(#)hpux9.m4 8.18 (Berkeley) 5/19/98') +VERSIONID(`@(#)hpux9.m4 8.19 (Berkeley) 10/6/1998') ifdef(`QUEUE_DIR',, `define(`QUEUE_DIR', /usr/spool/mqueue)')dnl -define(`ALIAS_FILE', /usr/lib/aliases)dnl -ifdef(`STATUS_FILE',, `define(`STATUS_FILE', /usr/lib/sendmail.st)')dnl +define(`ALIAS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/aliases', `/usr/lib/aliases'))dnl +ifdef(`STATUS_FILE',, `define(`STATUS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/statistics', `/usr/lib/sendmail.st'))')dnl ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', `/bin/rmail')')dnl ifdef(`LOCAL_MAILER_FLAGS',, `define(`LOCAL_MAILER_FLAGS', `m9')')dnl ifdef(`LOCAL_MAILER_ARGS',, `define(`LOCAL_MAILER_ARGS', `rmail -d $u')')dnl diff --git a/contrib/sendmail/cf/ostype/irix4.m4 b/contrib/sendmail/cf/ostype/irix4.m4 index 69890e6..aea6e9e 100644 --- a/contrib/sendmail/cf/ostype/irix4.m4 +++ b/contrib/sendmail/cf/ostype/irix4.m4 @@ -12,9 +12,9 @@ divert(-1) # divert(0) -VERSIONID(`@(#)irix4.m4 8.13 (Berkeley) 5/19/98') +VERSIONID(`@(#)irix4.m4 8.14 (Berkeley) 10/6/1998') ifdef(`LOCAL_MAILER_FLAGS',, `define(`LOCAL_MAILER_FLAGS', Ehm9)')dnl ifdef(`QUEUE_DIR',, `define(`QUEUE_DIR', /usr/spool/mqueue)')dnl -define(`ALIAS_FILE', /usr/lib/aliases)dnl -ifdef(`STATUS_FILE',, `define(`STATUS_FILE', /usr/lib/sendmail.st)')dnl +define(`ALIAS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/aliases', `/usr/lib/aliases'))dnl +ifdef(`STATUS_FILE',, `define(`STATUS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/statistics', `/usr/lib/sendmail.st'))')dnl define(`confEBINDIR', `/usr/lib')dnl diff --git a/contrib/sendmail/cf/ostype/irix5.m4 b/contrib/sendmail/cf/ostype/irix5.m4 index 32f2375..426f002 100644 --- a/contrib/sendmail/cf/ostype/irix5.m4 +++ b/contrib/sendmail/cf/ostype/irix5.m4 @@ -28,13 +28,13 @@ divert(-1) # divert(0) -VERSIONID(`@(#)irix5.m4 8.10 (Berkeley) 5/19/98') +VERSIONID(`@(#)irix5.m4 8.11 (Berkeley) 10/6/1998') ifdef(`LOCAL_MAILER_FLAGS',, `define(`LOCAL_MAILER_FLAGS', Ehmu9)')dnl ifdef(`LOCAL_MAILER_ARGS',, `define(`LOCAL_MAILER_ARGS', `mail -s -d $u')')dnl ifdef(`QUEUE_DIR',, `define(`QUEUE_DIR', /var/spool/mqueue)')dnl -define(`ALIAS_FILE', /etc/aliases)dnl -ifdef(`STATUS_FILE',, `define(`STATUS_FILE', /var/sendmail.st)')dnl -ifdef(`HELP_FILE',, `define(`HELP_FILE', /etc/sendmail.hf)')dnl +define(`ALIAS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/aliases', `/etc/aliases'))dnl +ifdef(`STATUS_FILE',, `define(`STATUS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/statistics', `/var/sendmail.st'))')dnl +ifdef(`HELP_FILE',, `define(`HELP_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/helpfile', `/etc/sendmail.hf'))')dnl define(`confDEF_USER_ID', `998:998')dnl define(`confTIME_ZONE', USE_TZ)dnl define(`confEBINDIR', `/usr/lib')dnl diff --git a/contrib/sendmail/cf/ostype/irix6.m4 b/contrib/sendmail/cf/ostype/irix6.m4 index f046dbf..d419202 100644 --- a/contrib/sendmail/cf/ostype/irix6.m4 +++ b/contrib/sendmail/cf/ostype/irix6.m4 @@ -28,13 +28,13 @@ divert(-1) # divert(0) -VERSIONID(`@(#)irix6.m4 8.7 (Berkeley) 5/19/98') +VERSIONID(`@(#)irix6.m4 8.8 (Berkeley) 10/6/1998') ifdef(`LOCAL_MAILER_FLAGS',, `define(`LOCAL_MAILER_FLAGS', Ehmu9)')dnl ifdef(`LOCAL_MAILER_ARGS',, `define(`LOCAL_MAILER_ARGS', `mail -s -d $u')')dnl ifdef(`QUEUE_DIR',, `define(`QUEUE_DIR', /var/spool/mqueue)')dnl -define(`ALIAS_FILE', /etc/aliases)dnl -ifdef(`STATUS_FILE',, `define(`STATUS_FILE', /var/sendmail.st)')dnl -ifdef(`HELP_FILE',, `define(`HELP_FILE', /etc/sendmail.hf)')dnl +define(`ALIAS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/aliases', `/etc/aliases'))dnl +ifdef(`STATUS_FILE',, `define(`STATUS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/statistics', `/var/sendmail.st'))')dnl +ifdef(`HELP_FILE',, `define(`HELP_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/helpfile', `/etc/sendmail.hf'))')dnl define(`confDEF_USER_ID', `998:998')dnl define(`confTIME_ZONE', USE_TZ)dnl define(`confEBINDIR', `/usr/lib')dnl diff --git a/contrib/sendmail/cf/ostype/isc4.1.m4 b/contrib/sendmail/cf/ostype/isc4.1.m4 index 1869eec..629835b 100644 --- a/contrib/sendmail/cf/ostype/isc4.1.m4 +++ b/contrib/sendmail/cf/ostype/isc4.1.m4 @@ -13,14 +13,14 @@ divert(-1) # divert(0) -VERSIONID(`@(#)isc4.1.m4 8.10 (Berkeley) 5/19/98') -define(`ALIAS_FILE', /usr/lib/aliases)dnl -ifdef(`HELP_FILE',, `define(`HELP_FILE', /usr/lib/sendmail.hf)')dnl +VERSIONID(`@(#)isc4.1.m4 8.11 (Berkeley) 10/6/1998') +define(`ALIAS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/aliases', `/usr/lib/aliases'))dnl +ifdef(`HELP_FILE',, `define(`HELP_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/helpfile', `/usr/lib/sendmail.hf'))')dnl ifdef(`LOCAL_MAILER_ARGS',, `define(`LOCAL_MAILER_ARGS', `lmail -s $u')')dnl ifdef(`LOCAL_MAILER_FLAGS',, `define(`LOCAL_MAILER_FLAGS', `humS9')')dnl ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', /bin/lmail)')dnl ifdef(`QUEUE_DIR',, `define(`QUEUE_DIR', /usr/spool/mqueue)')dnl -ifdef(`STATUS_FILE',, `define(`STATUS_FILE', /usr/lib/sendmail.st)')dnl +ifdef(`STATUS_FILE',, `define(`STATUS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/statistics', `/usr/lib/sendmail.st'))')dnl ifdef(`UUCP_MAILER_ARGS',, `define(`UUCP_MAILER_ARGS', `uux - -r -gC $h!rmail ($u)')')dnl ifdef(`UUCP_MAILER_PATH',, `define(`UUCP_MAILER_PATH', /usr/bin/uux)')dnl define(`confTIME_ZONE', `USE_TZ')dnl diff --git a/contrib/sendmail/cf/ostype/linux.m4 b/contrib/sendmail/cf/ostype/linux.m4 index d7c3b19..e1f7a92 100644 --- a/contrib/sendmail/cf/ostype/linux.m4 +++ b/contrib/sendmail/cf/ostype/linux.m4 @@ -12,5 +12,5 @@ divert(-1) # divert(0) -VERSIONID(`@(#)linux.m4 8.7 (Berkeley) 5/19/98') +VERSIONID(`@(#)linux.m4 8.7 (Berkeley) 5/19/1998') define(`LOCAL_MAILER_PATH', /bin/mail.local)dnl diff --git a/contrib/sendmail/cf/ostype/maxion.m4 b/contrib/sendmail/cf/ostype/maxion.m4 index c07ce87..a8ecfd0 100644 --- a/contrib/sendmail/cf/ostype/maxion.m4 +++ b/contrib/sendmail/cf/ostype/maxion.m4 @@ -15,12 +15,12 @@ divert(-1) # divert(0) -VERSIONID(`@(#)maxion.m4 8.10 (Berkeley) 5/19/98') +VERSIONID(`@(#)maxion.m4 8.11 (Berkeley) 10/6/1998') -define(`ALIAS_FILE', `/etc/ucbmail/aliases')dnl -define(`HELP_FILE', `/etc/ucbmail/sendmail.hf')dnl +define(`ALIAS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/aliases', `/etc/ucbmail/aliases'))dnl +define(`HELP_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/helpfile', `/etc/ucbmail/sendmail.hf'))dnl define(`QUEUE_DIR', `/var/spool/mqueue')dnl -define(`STATUS_FILE', `/var/adm/log/sendmail.st')dnl +define(`STATUS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/statistics', `/var/adm/log/sendmail.st'))dnl define(`LOCAL_MAILER_PATH', `/usr/bin/mail')dnl define(`LOCAL_MAILER_FLAGS',`rmn9')dnl define(`LOCAL_SHELL_FLAGS', `ehuP')dnl diff --git a/contrib/sendmail/cf/ostype/mklinux.m4 b/contrib/sendmail/cf/ostype/mklinux.m4 index 2f40c72..abcdbae 100644 --- a/contrib/sendmail/cf/ostype/mklinux.m4 +++ b/contrib/sendmail/cf/ostype/mklinux.m4 @@ -14,9 +14,9 @@ divert(-1) # divert(0) -VERSIONID(`@(#)mklinux.m4 8.7 (Berkeley) 5/19/98') +VERSIONID(`@(#)mklinux.m4 8.8 (Berkeley) 10/6/1998') ifdef(`STATUS_FILE',, - `define(`STATUS_FILE', /var/log/sendmail.st)') + `define(`STATUS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/statistics', `/var/log/sendmail.st'))') ifdef(`PROCMAIL_MAILER_PATH',, define(`PROCMAIL_MAILER_PATH', `/usr/bin/procmail')) FEATURE(local_procmail) diff --git a/contrib/sendmail/cf/ostype/nextstep.m4 b/contrib/sendmail/cf/ostype/nextstep.m4 index 73c995f..ebe6957 100644 --- a/contrib/sendmail/cf/ostype/nextstep.m4 +++ b/contrib/sendmail/cf/ostype/nextstep.m4 @@ -12,11 +12,11 @@ divert(-1) # divert(0) -VERSIONID(`@(#)nextstep.m4 8.14 (Berkeley) 5/19/98') +VERSIONID(`@(#)nextstep.m4 8.15 (Berkeley) 10/6/1998') define(`ALIAS_FILE', /etc/sendmail/aliases)dnl -define(`confCW_FILE', /etc/sendmail/sendmail.cw)dnl -ifdef(`HELP_FILE',, `define(`HELP_FILE', /usr/lib/sendmail.hf)')dnl -ifdef(`STATUS_FILE',, `define(`STATUS_FILE', /etc/sendmail/sendmail.st)')dnl +define(`confCW_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/local-host-names', `/etc/sendmail/sendmail.cw'))dnl +ifdef(`HELP_FILE',, `define(`HELP_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/helpfile', `/usr/lib/sendmail.hf'))')dnl +ifdef(`STATUS_FILE',, `define(`STATUS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/statistics', `/etc/sendmail/sendmail.st'))')dnl ifdef(`UUCP_MAILER_PATH',, `define(`UUCP_MAILER_PATH', /usr/bin/uux)')dnl ifdef(`QUEUE_DIR',, `define(`QUEUE_DIR', /usr/spool/mqueue)')dnl ifdef(`LOCAL_MAILER_FLAGS',, `define(`LOCAL_MAILER_FLAGS', `rmnP9')')dnl diff --git a/contrib/sendmail/cf/ostype/osf1.m4 b/contrib/sendmail/cf/ostype/osf1.m4 index fe17b35..7fcf1cf 100644 --- a/contrib/sendmail/cf/ostype/osf1.m4 +++ b/contrib/sendmail/cf/ostype/osf1.m4 @@ -12,8 +12,8 @@ divert(-1) # divert(0) -VERSIONID(`@(#)osf1.m4 8.10 (Berkeley) 5/19/98') -define(`ALIAS_FILE', /usr/adm/sendmail/aliases)dnl -ifdef(`STATUS_FILE',, `define(`STATUS_FILE', /usr/adm/sendmail/sendmail.st)')dnl -ifdef(`HELP_FILE',, `define(`HELP_FILE', /usr/share/lib/sendmail.hf)')dnl +VERSIONID(`@(#)osf1.m4 8.11 (Berkeley) 10/6/1998') +define(`ALIAS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/aliases', `/usr/adm/sendmail/aliases'))dnl +ifdef(`STATUS_FILE',, `define(`STATUS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/statistics', `/usr/adm/sendmail/sendmail.st'))')dnl +ifdef(`HELP_FILE',, `define(`HELP_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/helpfile', `/usr/share/lib/sendmail.hf'))')dnl define(`confDEF_USER_ID', `daemon') diff --git a/contrib/sendmail/cf/ostype/powerux.m4 b/contrib/sendmail/cf/ostype/powerux.m4 index dc23c7e..068bd8e 100644 --- a/contrib/sendmail/cf/ostype/powerux.m4 +++ b/contrib/sendmail/cf/ostype/powerux.m4 @@ -12,11 +12,11 @@ divert(-1) # divert(0) -VERSIONID(`@(#)powerux.m4 8.7 (Berkeley) 5/19/98') +VERSIONID(`@(#)powerux.m4 8.8 (Berkeley) 10/6/1998') define(`ALIAS_FILE', /etc/mail/aliases)dnl -ifdef(`HELP_FILE',,`define(`HELP_FILE', /etc/mail/sendmail.hf)')dnl -ifdef(`STATUS_FILE',,`define(`STATUS_FILE', /etc/mail/sendmail.st)')dnl +ifdef(`HELP_FILE',,`define(`HELP_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/helpfile', `/etc/mail/sendmail.hf'))')dnl +ifdef(`STATUS_FILE',,`define(`STATUS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/statistics', `/etc/mail/sendmail.st'))')dnl define(`LOCAL_MAILER_PATH', `/usr/bin/rmail')dnl define(`LOCAL_MAILER_FLAGS', `mn9')dnl define(`LOCAL_MAILER_ARGS', `rmail $u')dnl diff --git a/contrib/sendmail/cf/ostype/ptx2.m4 b/contrib/sendmail/cf/ostype/ptx2.m4 index 83a0558..d564ead 100644 --- a/contrib/sendmail/cf/ostype/ptx2.m4 +++ b/contrib/sendmail/cf/ostype/ptx2.m4 @@ -14,11 +14,11 @@ divert(-1) # Support for DYNIX/ptx 2.x. divert(0) -VERSIONID(`@(#)ptx2.m4 8.11 (Berkeley) 5/19/98') +VERSIONID(`@(#)ptx2.m4 8.12 (Berkeley) 10/6/1998') ifdef(`QUEUE_DIR',, `define(`QUEUE_DIR', /usr/spool/mqueue)')dnl -define(`ALIAS_FILE', /usr/lib/aliases)dnl -ifdef(`HELP_FILE',,`define(`HELP_FILE', /usr/lib/sendmail.hf)')dnl -ifdef(`STATUS_FILE',,`define(`STATUS_FILE', /usr/lib/sendmail.st)')dnl +define(`ALIAS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/aliases', `/usr/lib/aliases'))dnl +ifdef(`HELP_FILE',,`define(`HELP_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/helpfile', `/usr/lib/sendmail.hf'))')dnl +ifdef(`STATUS_FILE',,`define(`STATUS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/statistics', `/usr/lib/sendmail.st'))')dnl define(`LOCAL_MAILER_PATH', `/bin/mail')dnl define(`LOCAL_MAILER_FLAGS', `fmn9')dnl define(`LOCAL_SHELL_FLAGS', `eu')dnl diff --git a/contrib/sendmail/cf/ostype/qnx.m4 b/contrib/sendmail/cf/ostype/qnx.m4 index 10624dd..91ed669 100644 --- a/contrib/sendmail/cf/ostype/qnx.m4 +++ b/contrib/sendmail/cf/ostype/qnx.m4 @@ -12,9 +12,9 @@ divert(-1) # divert(0) -VERSIONID(`@(#)qnx.m4 8.7 (Berkeley) 5/19/98') +VERSIONID(`@(#)qnx.m4 8.8 (Berkeley) 10/6/1998') define(`QUEUE_DIR', /usr/spool/mqueue)dnl -define(`HELP_FILE', /etc/sendmail.hf)dnl +define(`HELP_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/helpfile', `/etc/sendmail.hf'))dnl define(`LOCAL_MAILER_ARGS', `mail $u')dnl define(`LOCAL_MAILER_FLAGS', `Sh')dnl define(`LOCAL_MAILER_PATH', /usr/bin/mailx)dnl diff --git a/contrib/sendmail/cf/ostype/riscos4.5.m4 b/contrib/sendmail/cf/ostype/riscos4.5.m4 index 02db750..c44a180 100644 --- a/contrib/sendmail/cf/ostype/riscos4.5.m4 +++ b/contrib/sendmail/cf/ostype/riscos4.5.m4 @@ -12,10 +12,10 @@ divert(-1) # divert(0) -VERSIONID(`@(#)riscos4.5.m4 8.10 (Berkeley) 5/19/98') +VERSIONID(`@(#)riscos4.5.m4 8.11 (Berkeley) 10/6/1998') ifdef(`LOCAL_MAILER_ARGS',, `define(`LOCAL_MAILER_ARGS', `rmail -d $u')')dnl -define(`ALIAS_FILE', `/usr/lib/aliases')dnl +define(`ALIAS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/aliases', `/usr/lib/aliases'))dnl ifdef(`QUEUE_DIR',, `define(`QUEUE_DIR', `/usr/spool/mqueue')')dnl -ifdef(`HELP_FILE',, `define(`HELP_FILE', `/usr/lib/sendmail.hf')')dnl +ifdef(`HELP_FILE',, `define(`HELP_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/helpfile', `/usr/lib/sendmail.hf'))')dnl define(`confEBINDIR', `/usr/lib')dnl diff --git a/contrib/sendmail/cf/ostype/sco-uw-2.1.m4 b/contrib/sendmail/cf/ostype/sco-uw-2.1.m4 index 356c984..07da0ad 100644 --- a/contrib/sendmail/cf/ostype/sco-uw-2.1.m4 +++ b/contrib/sendmail/cf/ostype/sco-uw-2.1.m4 @@ -12,11 +12,11 @@ divert(-1) # Contributed by Christopher Durham <chrisdu@SCO.COM> of SCO. # divert(0) -VERSIONID(`@(#)sco-uw-2.1.m4 8.6 (Berkeley) 5/19/98') +VERSIONID(`@(#)sco-uw-2.1.m4 8.7 (Berkeley) 10/6/1998') -define(`ALIAS_FILE', /usr/lib/mail/aliases)dnl -ifdef(`HELP_FILE',,`define(`HELP_FILE', /usr/ucblib/sendmail.hf)')dnl -ifdef(`STATUS_FILE',,`define(`STATUS_FILE', /usr/ucblib/sendmail.st)')dnl +define(`ALIAS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/aliases', `/usr/lib/mail/aliases'))dnl +ifdef(`HELP_FILE',,`define(`HELP_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/helpfile', `/usr/ucblib/sendmail.hf'))')dnl +ifdef(`STATUS_FILE',,`define(`STATUS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/statistics', `/usr/ucblib/sendmail.st'))')dnl define(`LOCAL_MAILER_PATH', `/usr/bin/rmail')dnl define(`LOCAL_MAILER_FLAGS', `fhCEn9')dnl define(`LOCAL_SHELL_FLAGS', `ehuP')dnl diff --git a/contrib/sendmail/cf/ostype/sco3.2.m4 b/contrib/sendmail/cf/ostype/sco3.2.m4 index 1c58585..135fefa 100644 --- a/contrib/sendmail/cf/ostype/sco3.2.m4 +++ b/contrib/sendmail/cf/ostype/sco3.2.m4 @@ -12,10 +12,10 @@ divert(-1) # divert(0) -VERSIONID(`@(#)sco3.2.m4 8.10 (Berkeley) 5/19/98') -define(`ALIAS_FILE', /usr/lib/mail/aliases)dnl +VERSIONID(`@(#)sco3.2.m4 8.11 (Berkeley) 10/6/1998') +define(`ALIAS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/aliases', `/usr/lib/mail/aliases'))dnl ifdef(`QUEUE_DIR',, `define(`QUEUE_DIR', /usr/spool/mqueue)')dnl -ifdef(`STATUS_FILE',, `define(`STATUS_FILE', /usr/lib/sendmail.st)')dnl +ifdef(`STATUS_FILE',, `define(`STATUS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/statistics', `/usr/lib/sendmail.st'))')dnl ifdef(`UUCP_MAILER_PATH',, `define(`UUCP_MAILER_PATH', /usr/bin/uux)')dnl ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', /usr/bin/lmail)')dnl ifdef(`LOCAL_MAILER_FLAGS',, `define(`LOCAL_MAILER_FLAGS', PuhCE9)')dnl diff --git a/contrib/sendmail/cf/ostype/sinix.m4 b/contrib/sendmail/cf/ostype/sinix.m4 index 51c469d..37d12d4 100644 --- a/contrib/sendmail/cf/ostype/sinix.m4 +++ b/contrib/sendmail/cf/ostype/sinix.m4 @@ -12,10 +12,10 @@ divert(-1) # divert(0) -VERSIONID(`@(#)sinix.m4 8.8 (Berkeley) 5/19/98') +VERSIONID(`@(#)sinix.m4 8.9 (Berkeley) 10/6/1998') ifdef(`QUEUE_DIR',, `define(`QUEUE_DIR', /var/spool/mqueue)')dnl -define(`ALIAS_FILE', /etc/aliases)dnl +define(`ALIAS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/aliases', `/etc/aliases'))dnl define(`LOCAL_MAILER_PATH', `/bin/mail.local')dnl -ifdef(`STATUS_FILE',, `define(`STATUS_FILE', /var/sendmail.st)')dnl -ifdef(`HELP_FILE',, `define(`HELP_FILE', /etc/sendmail.hf)')dnl +ifdef(`STATUS_FILE',, `define(`STATUS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/statistics', `/var/sendmail.st'))')dnl +ifdef(`HELP_FILE',, `define(`HELP_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/helpfile', `/etc/sendmail.hf'))')dnl define(`confEBINDIR', `/usr/ucblib')dnl diff --git a/contrib/sendmail/cf/ostype/solaris2.m4 b/contrib/sendmail/cf/ostype/solaris2.m4 index 5a90175b..5a0e2a9 100644 --- a/contrib/sendmail/cf/ostype/solaris2.m4 +++ b/contrib/sendmail/cf/ostype/solaris2.m4 @@ -12,14 +12,14 @@ divert(-1) # divert(0) -VERSIONID(`@(#)solaris2.m4 8.15 (Berkeley) 5/19/98') +VERSIONID(`@(#)solaris2.m4 8.16 (Berkeley) 10/6/1998') divert(-1) define(`ALIAS_FILE', /etc/mail/aliases) -ifdef(`HELP_FILE',, `define(`HELP_FILE', /etc/mail/sendmail.hf)') -ifdef(`STATUS_FILE',, `define(`STATUS_FILE', /etc/mail/sendmail.st)') +ifdef(`HELP_FILE',, `define(`HELP_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/helpfile', `/etc/mail/sendmail.hf'))') +ifdef(`STATUS_FILE',, `define(`STATUS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/statistics', `/etc/mail/sendmail.st'))') ifdef(`LOCAL_MAILER_FLAGS',, `define(`LOCAL_MAILER_FLAGS', `SnE9')') ifdef(`LOCAL_MAILER_ARGS',, `define(`LOCAL_MAILER_ARGS', `mail -f $g -d $u')') ifdef(`UUCP_MAILER_ARGS',, `define(`UUCP_MAILER_ARGS', `uux - -r -a$g $h!rmail ($u)')') -define(`confCW_FILE', /etc/mail/sendmail.cw) +define(`confCW_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/local-host-names', `/etc/mail/sendmail.cw')) define(`confEBINDIR', `/usr/lib')dnl diff --git a/contrib/sendmail/cf/ostype/solaris2.ml.m4 b/contrib/sendmail/cf/ostype/solaris2.ml.m4 index 0995d50..f99cebb 100644 --- a/contrib/sendmail/cf/ostype/solaris2.ml.m4 +++ b/contrib/sendmail/cf/ostype/solaris2.ml.m4 @@ -16,15 +16,15 @@ divert(-1) # divert(0) -VERSIONID(`@(#)solaris2.ml.m4 8.8 (Berkeley) 5/19/98') +VERSIONID(`@(#)solaris2.ml.m4 8.9 (Berkeley) 10/6/1998') divert(-1) define(`ALIAS_FILE', /etc/mail/aliases) -ifdef(`HELP_FILE',, `define(`HELP_FILE', /etc/mail/sendmail.hf)') -ifdef(`STATUS_FILE',, `define(`STATUS_FILE', /etc/mail/sendmail.st)') +ifdef(`HELP_FILE',, `define(`HELP_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/helpfile', `/etc/mail/sendmail.hf'))') +ifdef(`STATUS_FILE',, `define(`STATUS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/statistics', `/etc/mail/sendmail.st'))') ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', `/usr/lib/mail.local')') ifdef(`LOCAL_MAILER_FLAGS',, `define(`LOCAL_MAILER_FLAGS', `fSmn9')') ifdef(`LOCAL_MAILER_ARGS',, `define(`LOCAL_MAILER_ARGS', `mail.local -d $u')') ifdef(`UUCP_MAILER_ARGS',, `define(`UUCP_MAILER_ARGS', `uux - -r -a$g $h!rmail ($u)')') -define(`confCW_FILE', /etc/mail/sendmail.cw) +define(`confCW_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/local-host-names', `/etc/mail/sendmail.cw')) define(`confEBINDIR', `/usr/lib')dnl diff --git a/contrib/sendmail/cf/ostype/sunos3.5.m4 b/contrib/sendmail/cf/ostype/sunos3.5.m4 index 540d36e..aeda272 100644 --- a/contrib/sendmail/cf/ostype/sunos3.5.m4 +++ b/contrib/sendmail/cf/ostype/sunos3.5.m4 @@ -12,6 +12,6 @@ divert(-1) # divert(0) -VERSIONID(`@(#)sunos3.5.m4 8.7 (Berkeley) 5/19/98') +VERSIONID(`@(#)sunos3.5.m4 8.7 (Berkeley) 5/19/1998') define(`confEBINDIR', `/usr/lib')dnl diff --git a/contrib/sendmail/cf/ostype/sunos4.1.m4 b/contrib/sendmail/cf/ostype/sunos4.1.m4 index aec96d2..78648da 100644 --- a/contrib/sendmail/cf/ostype/sunos4.1.m4 +++ b/contrib/sendmail/cf/ostype/sunos4.1.m4 @@ -12,6 +12,6 @@ divert(-1) # divert(0) -VERSIONID(`@(#)sunos4.1.m4 8.7 (Berkeley) 5/19/98') +VERSIONID(`@(#)sunos4.1.m4 8.7 (Berkeley) 5/19/1998') define(`confEBINDIR', `/usr/lib')dnl diff --git a/contrib/sendmail/cf/ostype/svr4.m4 b/contrib/sendmail/cf/ostype/svr4.m4 index 1451414..d0de278 100644 --- a/contrib/sendmail/cf/ostype/svr4.m4 +++ b/contrib/sendmail/cf/ostype/svr4.m4 @@ -12,11 +12,11 @@ divert(-1) # divert(0) -VERSIONID(`@(#)svr4.m4 8.10 (Berkeley) 5/19/98') +VERSIONID(`@(#)svr4.m4 8.11 (Berkeley) 10/6/1998') -define(`ALIAS_FILE', /usr/ucblib/aliases)dnl -ifdef(`HELP_FILE',,`define(`HELP_FILE', /usr/ucblib/sendmail.hf)')dnl -ifdef(`STATUS_FILE',,`define(`STATUS_FILE', /usr/ucblib/sendmail.st)')dnl +define(`ALIAS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/aliases', `/usr/ucblib/aliases'))dnl +ifdef(`HELP_FILE',,`define(`HELP_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/helpfile', `/usr/ucblib/sendmail.hf'))')dnl +ifdef(`STATUS_FILE',,`define(`STATUS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/statistics', `/usr/ucblib/sendmail.st'))')dnl define(`LOCAL_MAILER_PATH', `/usr/ucblib/binmail')dnl define(`LOCAL_MAILER_FLAGS', `rmn9')dnl define(`LOCAL_SHELL_FLAGS', `ehuP')dnl diff --git a/contrib/sendmail/cf/ostype/ultrix4.m4 b/contrib/sendmail/cf/ostype/ultrix4.m4 index 874fa8b..d10518a 100644 --- a/contrib/sendmail/cf/ostype/ultrix4.m4 +++ b/contrib/sendmail/cf/ostype/ultrix4.m4 @@ -12,6 +12,6 @@ divert(-1) # divert(0) -VERSIONID(`@(#)ultrix4.m4 8.8 (Berkeley) 5/19/98') +VERSIONID(`@(#)ultrix4.m4 8.8 (Berkeley) 5/19/1998') define(`confEBINDIR', `/usr/lib')dnl diff --git a/contrib/sendmail/cf/ostype/unixware7.m4 b/contrib/sendmail/cf/ostype/unixware7.m4 new file mode 100644 index 0000000..af1bcc8 --- /dev/null +++ b/contrib/sendmail/cf/ostype/unixware7.m4 @@ -0,0 +1,16 @@ +divert(-1) +# +# Copyright (c) 1998 Sendmail, Inc. 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(`@(#)unixware7.m4 8.1 (Berkeley) 10/13/1998') +define(`ALIAS_FILE', `/etc/mail/aliases')dnl +ifdef(`QUEUE_DIR',, `define(`QUEUE_DIR', /usr/spool/mqueue)')dnl +ifdef(`STATUS_FILE',, `define(`STATUS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/statistics', `/etc/mailer/sendmail.st'))')dnl +define(`confEBINDIR', `/usr/lib')dnl diff --git a/contrib/sendmail/cf/ostype/unknown.m4 b/contrib/sendmail/cf/ostype/unknown.m4 index bb85604..629c31b 100644 --- a/contrib/sendmail/cf/ostype/unknown.m4 +++ b/contrib/sendmail/cf/ostype/unknown.m4 @@ -12,7 +12,7 @@ divert(-1) # divert(0) -VERSIONID(`@(#)unknown.m4 8.6 (Berkeley) 5/19/98') +VERSIONID(`@(#)unknown.m4 8.6 (Berkeley) 5/19/1998') errprint(`*** ERROR: You have not specified a valid operating system type.') errprint(` Use the OSTYPE macro to select a valid system type. This') errprint(` is necessary in order to get the proper pathnames and flags') diff --git a/contrib/sendmail/cf/ostype/uxpds.m4 b/contrib/sendmail/cf/ostype/uxpds.m4 index 2fb147e..0f1d908 100644 --- a/contrib/sendmail/cf/ostype/uxpds.m4 +++ b/contrib/sendmail/cf/ostype/uxpds.m4 @@ -15,12 +15,12 @@ divert(-1) # divert(0) -VERSIONID(`@(#)uxpds.m4 8.9 (Berkeley) 5/19/98') +VERSIONID(`@(#)uxpds.m4 8.10 (Berkeley) 10/6/1998') define(`confDEF_GROUP_ID', `6') -define(`ALIAS_FILE', /usr/ucblib/aliases)dnl -ifdef(`HELP_FILE',,`define(`HELP_FILE', /usr/ucblib/sendmail.hf)')dnl -ifdef(`STATUS_FILE',,`define(`STATUS_FILE', /usr/ucblib/sendmail.st)')dnl +define(`ALIAS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/aliases', `/usr/ucblib/aliases'))dnl +ifdef(`HELP_FILE',,`define(`HELP_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/helpfile', `/usr/ucblib/sendmail.hf'))')dnl +ifdef(`STATUS_FILE',,`define(`STATUS_FILE', ifdef(`_USE_ETC_MAIL_', `/etc/mail/statistics', `/usr/ucblib/sendmail.st'))')dnl define(`LOCAL_MAILER_PATH', `/usr/ucblib/binmail')dnl define(`LOCAL_MAILER_FLAGS', `rmn9')dnl define(`LOCAL_SHELL_FLAGS', `ehuP')dnl diff --git a/contrib/sendmail/cf/sh/makeinfo.sh b/contrib/sendmail/cf/sh/makeinfo.sh index 424c699..c8621f4 100644 --- a/contrib/sendmail/cf/sh/makeinfo.sh +++ b/contrib/sendmail/cf/sh/makeinfo.sh @@ -10,7 +10,7 @@ # the sendmail distribution. # # -# @(#)makeinfo.sh 8.11 (Berkeley) 5/19/98 +# @(#)makeinfo.sh 8.11 (Berkeley) 5/19/1998 # usewhoami=0 |
