diff options
Diffstat (limited to 'usr.sbin/sendmail/cf')
| -rw-r--r-- | usr.sbin/sendmail/cf/m4/cfhead.m4 | 6 | ||||
| -rw-r--r-- | usr.sbin/sendmail/cf/m4/proto.m4 | 6 | ||||
| -rw-r--r-- | usr.sbin/sendmail/cf/m4/version.m4 | 4 | ||||
| -rw-r--r-- | usr.sbin/sendmail/cf/ostype/mklinux.m4 | 4 |
4 files changed, 11 insertions, 9 deletions
diff --git a/usr.sbin/sendmail/cf/m4/cfhead.m4 b/usr.sbin/sendmail/cf/m4/cfhead.m4 index f152572..91d4b9a 100644 --- a/usr.sbin/sendmail/cf/m4/cfhead.m4 +++ b/usr.sbin/sendmail/cf/m4/cfhead.m4 @@ -128,7 +128,9 @@ define(`confMAILER_NAME', ``MAILER-DAEMON'') define(`confFROM_LINE', `From $g $d') define(`confOPERATORS', `.:%@!^/[]+') define(`confSMTP_LOGIN_MSG', `$j Sendmail $v/$Z; $b') -define(`confRECEIVED_HEADER', `$?sfrom $s $.$?_($?s$|from $.$_) $.by $j ($v/$Z)$?r with $r$. id $i$?u for $u$.; $b') +define(`confRECEIVED_HEADER', `$?sfrom $s $.$?_($?s$|from $.$_) + $.by $j ($v/$Z)$?r with $r$. + id $i$?u for $u$.; $b') define(`confSEVEN_BIT_INPUT', `False') define(`confEIGHT_BIT_HANDLING', `pass8') define(`confALIAS_WAIT', `10') @@ -154,4 +156,4 @@ define(`confMIME_FORMAT_ERRORS', `True') define(`confFORWARD_PATH', `$z/.forward.$w:$z/.forward') divert(0)dnl -VERSIONID(`@(#)cfhead.m4 8.6 (Berkeley) 6/19/96') +VERSIONID(`@(#)cfhead.m4 8.7 (Berkeley) 11/20/96') diff --git a/usr.sbin/sendmail/cf/m4/proto.m4 b/usr.sbin/sendmail/cf/m4/proto.m4 index 474dc7d..676aa35 100644 --- a/usr.sbin/sendmail/cf/m4/proto.m4 +++ b/usr.sbin/sendmail/cf/m4/proto.m4 @@ -34,7 +34,7 @@ divert(-1) # divert(0) -VERSIONID(`@(#)proto.m4 8.135 (Berkeley) 10/26/96') +VERSIONID(`@(#)proto.m4 8.136 (Berkeley) 11/24/96') MAILER(local)dnl @@ -428,7 +428,7 @@ _OPTION(OperatorChars, `confOPERATORS') # shall I avoid calling initgroups(3) because of high NIS costs? _OPTION(DontInitGroups, `confDONT_INIT_GROUPS') -# are group-writable :include: and .forward files (un)trustworthy? +# are group-writable `:include:' and .forward files (un)trustworthy? _OPTION(UnsafeGroupWrites, `confUNSAFE_GROUP_WRITES') # where do errors that occur when sending errors get sent? @@ -635,7 +635,7 @@ ifdef(`_USE_DECNET_SYNTAX_', R$+ @ $+ . DECNET $2 :: $1 u@h.DECNET => h::u', `dnl') # delete duplicate local names -R$+ % $=w @ $=w $1 @ $j u%host@host => u@host +R$+ % $=w @ $=w $1 @ $2 u%host@host => u@host diff --git a/usr.sbin/sendmail/cf/m4/version.m4 b/usr.sbin/sendmail/cf/m4/version.m4 index 0fe40a9..b3ee9a7 100644 --- a/usr.sbin/sendmail/cf/m4/version.m4 +++ b/usr.sbin/sendmail/cf/m4/version.m4 @@ -32,8 +32,8 @@ divert(-1) # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -VERSIONID(`@(#)version.m4 8.8.3.1 (Berkeley) 11/16/96') +VERSIONID(`@(#)version.m4 8.8.4.2 (Berkeley) 11/26/96') # divert(0) # Configuration version number -DZ8.8.3`'ifdef(`confCF_VERSION', `/confCF_VERSION') +DZ8.8.4`'ifdef(`confCF_VERSION', `/confCF_VERSION') diff --git a/usr.sbin/sendmail/cf/ostype/mklinux.m4 b/usr.sbin/sendmail/cf/ostype/mklinux.m4 index 1da5928..00adedb 100644 --- a/usr.sbin/sendmail/cf/ostype/mklinux.m4 +++ b/usr.sbin/sendmail/cf/ostype/mklinux.m4 @@ -32,11 +32,11 @@ divert(-1) # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF # SUCH DAMAGE. # -# MkLinux support contributed by Paul DeBois <dubois@primate.wisc.edu> +# MkLinux support contributed by Paul DuBois <dubois@primate.wisc.edu> # divert(0) -VERSIONID(`@(#)mklinux.m4 8.1 (Berkeley) 10/30/96') +VERSIONID(`@(#)mklinux.m4 8.2 (Berkeley) 11/17/96') ifdef(`STATUS_FILE',, `define(`STATUS_FILE', /var/log/sendmail.st)') ifdef(`PROCMAIL_MAILER_PATH',, |
