diff options
| author | peter <peter@FreeBSD.org> | 1999-01-12 12:38:06 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 1999-01-12 12:38:06 +0000 |
| commit | 5b758ef6d89ac3abe22adbdc3386c76d72691136 (patch) | |
| tree | 6c4f3826ab567145a7eba959bc71c7eab01748b1 /contrib/sendmail/cf | |
| parent | 6788eff0e6370de72568309d3a8b1891341b0991 (diff) | |
| download | FreeBSD-src-5b758ef6d89ac3abe22adbdc3386c76d72691136.zip FreeBSD-src-5b758ef6d89ac3abe22adbdc3386c76d72691136.tar.gz | |
Merge sendmail 8.9.1 -> 8.9.2 changes into mainline. Some of our changes
were submitted back to sendmail.org (stage 1) and were incorporated.
Diffstat (limited to 'contrib/sendmail/cf')
| -rw-r--r-- | contrib/sendmail/cf/m4/cfhead.m4 | 6 | ||||
| -rw-r--r-- | contrib/sendmail/cf/ostype/bsd4.4.m4 | 6 | ||||
| -rw-r--r-- | contrib/sendmail/cf/sh/makeinfo.sh | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/contrib/sendmail/cf/m4/cfhead.m4 b/contrib/sendmail/cf/m4/cfhead.m4 index d5778e8..abd390e 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', `.:%@!^/[]+') @@ -134,10 +134,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/ostype/bsd4.4.m4 b/contrib/sendmail/cf/ostype/bsd4.4.m4 index 711610c..f94e653 100644 --- a/contrib/sendmail/cf/ostype/bsd4.4.m4 +++ b/contrib/sendmail/cf/ostype/bsd4.4.m4 @@ -13,9 +13,9 @@ 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(`LOCAL_MAILER_ARGS',, `define(`LOCAL_MAILER_ARGS', `mail $u')')dnl ifdef(`UUCP_MAILER_ARGS',, `define(`UUCP_MAILER_ARGS', `uux - -r -z -a$g $h!rmail ($u)')')dnl diff --git a/contrib/sendmail/cf/sh/makeinfo.sh b/contrib/sendmail/cf/sh/makeinfo.sh index 0cbb335..91de99b 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 |
