diff options
Diffstat (limited to 'usr.sbin/sendmail/cf')
| -rw-r--r-- | usr.sbin/sendmail/cf/README | 10 | ||||
| -rw-r--r-- | usr.sbin/sendmail/cf/cf/knecht.mc | 5 | ||||
| -rw-r--r-- | usr.sbin/sendmail/cf/m4/version.m4 | 4 | ||||
| -rw-r--r-- | usr.sbin/sendmail/cf/ostype/sinix.m4 | 15 |
4 files changed, 16 insertions, 18 deletions
diff --git a/usr.sbin/sendmail/cf/README b/usr.sbin/sendmail/cf/README index af8cdb1c7bb85..184a3532559ea 100644 --- a/usr.sbin/sendmail/cf/README +++ b/usr.sbin/sendmail/cf/README @@ -4,7 +4,7 @@ Eric Allman <eric@CS.Berkeley.EDU> - @(#)README 8.122 (Berkeley) 7/6/97 + @(#)README 8.124 (Berkeley) 9/23/97 This document describes the sendmail configuration files being used @@ -657,7 +657,7 @@ genericstable This feature will cause certain addresses originating in the The key for this table is either the full address or the unqualified username (the former is tried first); the value is the new user address. If the new user address does - not include a domain, $j is used. Note that the address must + not include a domain, $j is used. Note that the address being looked up must be fully qualified. For local mail, it is necessary to use FEATURE(always_add_domain) for the addresses to be qualified. @@ -1335,10 +1335,10 @@ confCF_VERSION $Z macro If defined, this is appended to the confFROM_HEADER From: [$?x$x <$g>$|$g$.] The format of an internally generated From: address. confRECEIVED_HEADER Received: - [$?sfrom $s .$?_($?s$|from $.$_) + [$?sfrom $s $.$?_($?s$|from $.$_) $.by $j ($v/$Z)$?r with $r$. id $i$?u - for $u$.; - $b] + for $u; $|; + $.$b] The format of the Received: header in messages passed through this host. It is unwise to try to change this. diff --git a/usr.sbin/sendmail/cf/cf/knecht.mc b/usr.sbin/sendmail/cf/cf/knecht.mc index 111ac78288461..71ae12b69bdcd 100644 --- a/usr.sbin/sendmail/cf/cf/knecht.mc +++ b/usr.sbin/sendmail/cf/cf/knecht.mc @@ -38,7 +38,7 @@ divert(-1) # divert(0)dnl -VERSIONID(`@(#)knecht.mc 8.13 (Berkeley) 7/7/97') +VERSIONID(`@(#)knecht.mc 8.15 (Berkeley) 10/20/97') OSTYPE(bsd4.4)dnl DOMAIN(generic)dnl define(`confFORWARD_PATH', `$z/.forward.$w:$z/.forward+$h:$z/.forward')dnl @@ -48,6 +48,7 @@ define(`confTO_ICONNECT', `10s')dnl define(`confCOPY_ERRORS_TO', `Postmaster')dnl define(`confTO_QUEUEWARN', `8h')dnl define(`confPRIVACY_FLAGS', ``authwarnings,noexpn,novrfy'')dnl +define(`LOCAL_MAILER_FLAGS', `rmn9P')dnl FEATURE(virtusertable)dnl MAILER(local)dnl MAILER(smtp)dnl @@ -119,7 +120,7 @@ R<FAIL> $* $#error $: 451 Sender domain must resolve # handle case of no @domain on address R<?> $* $: < ? $&{client_name} > $1 R<?> $* $@ <OK> ...local unqualed ok -R<? $+> $* $#error $: 551 Domain name required +R<? $+> $* $#error $: 550 Domain name required ...remote is not R<$+> $* $#error $: $1 error from domaincheck diff --git a/usr.sbin/sendmail/cf/m4/version.m4 b/usr.sbin/sendmail/cf/m4/version.m4 index 0e03173f70007..a2cbdc9144d7d 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.7.1 (Berkeley) 8/1/97') +VERSIONID(`@(#)version.m4 8.8.8.1 (Berkeley) 10/24/97') # divert(0) # Configuration version number -DZ8.8.7`'ifdef(`confCF_VERSION', `/confCF_VERSION') +DZ8.8.8`'ifdef(`confCF_VERSION', `/confCF_VERSION') diff --git a/usr.sbin/sendmail/cf/ostype/sinix.m4 b/usr.sbin/sendmail/cf/ostype/sinix.m4 index 7b50e9e2cc319..278d4c84cec06 100644 --- a/usr.sbin/sendmail/cf/ostype/sinix.m4 +++ b/usr.sbin/sendmail/cf/ostype/sinix.m4 @@ -34,12 +34,9 @@ divert(-1) # divert(0) -VERSIONID(`@(#)sinix.m4 8.1 (Berkeley) 12/14/96') -define(`QUEUE_DIR', /usr/ucblib/mqueue)dnl -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(`LOCAL_MAILER_PATH', `/usr/ucblib/mail.local')dnl -define(`LOCAL_MAILER_FLAGS', `rmn9')dnl -define(`LOCAL_SHELL_FLAGS', `ehuP')dnl -define(`UUCP_MAILER_ARGS', `uux - -r -a$g -gmedium $h!rmail ($u)')dnl +VERSIONID(`@(#)sinix.m4 8.2 (Berkeley) 9/13/97') +ifdef(`QUEUE_DIR',, `define(`QUEUE_DIR', /var/spool/mqueue)')dnl +define(`ALIAS_FILE', /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 |