Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-1-5]: src/gnu/dist/sendmail/cf/cf Sync to version 1.4 (requested ...
details: https://anonhg.NetBSD.org/src/rev/e9b1bcc432f6
branches: netbsd-1-5
changeset: 492806:e9b1bcc432f6
user: he <he%NetBSD.org@localhost>
date: Wed Feb 20 23:14:18 2002 +0000
description:
Sync to version 1.4 (requested by itojun):
Upgrade sendmail to version 8.11.6.
(Diff is 1.1.1.2 -> 1.4)
diffstat:
gnu/dist/sendmail/cf/cf/generic-nextstep3.3.cf | 49 ++++++++++++-------------
1 files changed, 24 insertions(+), 25 deletions(-)
diffs (157 lines):
diff -r b8a1d23b71aa -r e9b1bcc432f6 gnu/dist/sendmail/cf/cf/generic-nextstep3.3.cf
--- a/gnu/dist/sendmail/cf/cf/generic-nextstep3.3.cf Wed Feb 20 23:13:02 2002 +0000
+++ b/gnu/dist/sendmail/cf/cf/generic-nextstep3.3.cf Wed Feb 20 23:14:18 2002 +0000
@@ -16,14 +16,14 @@
#####
##### SENDMAIL CONFIGURATION FILE
#####
-##### built by gshapiro%horsey.gshapiro.net@localhost on Tue Feb 27 14:54:24 PST 2001
-##### in /usr/local/src/sendmail/devel/8.11/OpenSource/sendmail-8.11.3/cf/cf
+##### built by gshapiro%horsey.gshapiro.net@localhost on Mon Aug 20 08:01:48 PDT 2001
+##### in /usr/local/src/sendmail/devel/8.11/OpenSource/sendmail-8.11.6/cf/cf
##### using ../ as configuration include directory
#####
######################################################################
######################################################################
-##### Id: cfhead.m4,v 8.76.4.15 2001/02/14 04:07:20 gshapiro Exp #####
+##### Id: cfhead.m4,v 8.76.4.16 2001/03/06 22:56:36 ca Exp #####
##### Id: cf.m4,v 8.32 1999/02/07 07:26:14 gshapiro Exp #####
##### Id: generic-nextstep3.3.mc,v 8.10 1999/02/07 07:26:02 gshapiro Exp #####
@@ -37,7 +37,7 @@
-##### Id: proto.m4,v 8.446.2.5.2.38 2000/12/28 03:37:28 ca Exp #####
+##### Id: proto.m4,v 8.446.2.5.2.44 2001/07/31 22:25:49 gshapiro Exp #####
# level 9 config file format
@@ -84,7 +84,6 @@
Kresolve host -a<OK> -T<TEMP>
-
# Hosts for which relaying is permitted ($=R)
FR-o /etc/mail/relay-domains
@@ -117,7 +116,7 @@
CPREDIRECT
# Configuration version number
-DZ8.11.3
+DZ8.11.6
###############
@@ -128,7 +127,7 @@
O SevenBitInput=False
# 8-bit data handling
-O EightBitMode=pass8
+#O EightBitMode=pass8
# wait for alias file rebuild (default units: minutes)
O AliasWait=10
@@ -521,7 +520,7 @@
R@ $* <@> $: @ $1 unmark @host:...
R$* :: $* <@> $: $1 :: $2 unmark node::addr
R:include: $* <@> $: :include: $1 unmark :include:...
-R$* [ IPv6 $- ] <@> $: $1 [ IPv6 $2 ] unmark IPv6 addr
+R$* [ IPv6 : $+ ] <@> $: $1 [ IPv6 : $2 ] unmark IPv6 addr
R$* : $* [ $* ] $: $1 : $2 [ $3 ] <@> remark if leading colon
R$* : $* <@> $: $2 strip colon if marked
R$* <@> $: $1 unmark
@@ -581,9 +580,9 @@
R$* < @ localhost . UUCP > $* $: $1 < @ $j . > $2 .UUCP domain
# check for IPv6 domain literal (save quoted form)
-R$* < @ [ IPv6 $- ] > $* $: $2 $| $1 < @@ [ $(dequote $2 $) ] > $3 mark IPv6 addr
-R$- $| $* < @@ $=w > $* $: $2 < @ $j . > $4 self-literal
-R$- $| $* < @@ [ $+ ] > $* $@ $2 < @ [ IPv6 $1 ] > $4 canon IP addr
+R$* < @ [ IPv6 : $+ ] > $* $: $2 $| $1 < @@ [ $(dequote $2 $) ] > $3 mark IPv6 addr
+R$+ $| $* < @@ $=w > $* $: $2 < @ $j . > $4 self-literal
+R$+ $| $* < @@ [ $+ ] > $* $@ $2 < @ [ IPv6 : $1 ] > $4 canon IP addr
# check for IPv4 domain literal
R$* < @ [ $+ ] > $* $: $1 < @@ [ $2 ] > $3 mark [a.b.c.d]
@@ -672,25 +671,25 @@
SParse0
R<@> $@ <@> special case error msgs
-R$* : $* ; <@> $#error $@ 5.1.3 $: "501 List:; syntax illegal for recipient addresses"
+R$* : $* ; <@> $#error $@ 5.1.3 $: "553 List:; syntax illegal for recipient addresses"
R@ <@ $* > < @ $1 > catch "@@host" bogosity
-R<@ $+> $#error $@ 5.1.3 $: "501 User address required"
+R<@ $+> $#error $@ 5.1.3 $: "553 User address required"
R$* $: <> $1
R<> $* < @ [ $+ ] > $* $1 < @ [ $2 ] > $3
-R<> $* <$* : $* > $* $#error $@ 5.1.3 $: "501 Colon illegal in host name part"
+R<> $* <$* : $* > $* $#error $@ 5.1.3 $: "553 Colon illegal in host name part"
R<> $* $1
-R$* < @ . $* > $* $#error $@ 5.1.2 $: "501 Invalid host name"
-R$* < @ $* .. $* > $* $#error $@ 5.1.2 $: "501 Invalid host name"
-R$* , $~O $* $#error $@ 5.1.2 $: "501 Invalid route address"
+R$* < @ . $* > $* $#error $@ 5.1.2 $: "553 Invalid host name"
+R$* < @ $* .. $* > $* $#error $@ 5.1.2 $: "553 Invalid host name"
+R$* , $~O $* $#error $@ 5.1.2 $: "553 Invalid route address"
# now delete the local info -- note $=O to find characters that cause forwarding
R$* < @ > $* $@ $>Parse0 $>canonify $1 user@ => user
R< @ $=w . > : $* $@ $>Parse0 $>canonify $2 @here:... -> ...
R$- < @ $=w . > $: $(dequote $1 $) < @ $2 . > dequote "foo"@here
-R< @ $+ > $#error $@ 5.1.3 $: "501 User address required"
+R< @ $+ > $#error $@ 5.1.3 $: "553 User address required"
R$* $=O $* < @ $=w . > $@ $>Parse0 $>canonify $1 $2 $3 ...@here -> ...
R$- $: $(dequote $1 $) < @ *LOCAL* > dequote "foo"
-R< @ *LOCAL* > $#error $@ 5.1.3 $: "501 User address required"
+R< @ *LOCAL* > $#error $@ 5.1.3 $: "553 User address required"
R$* $=O $* < @ *LOCAL* >
$@ $>Parse0 $>canonify $1 $2 $3 ...@*LOCAL* -> ...
R$* < @ *LOCAL* > $: $1
@@ -704,8 +703,8 @@
# handle numeric address spec
R$* < @ [ $+ ] > $* $: $>ParseLocal $1 < @ [ $2 ] > $3 numeric internet spec
R$* < @ [ $+ ] > $* $1 < @ [ $2 ] : $S > $3 Add smart host to path
-R$* < @ [ IPv6 $- ] : > $*
- $#esmtp $@ [ $(dequote $2 $) ] $: $1 < @ [IPv6 $2 ] > $3 no smarthost: send
+R$* < @ [ IPv6 : $+ ] : > $*
+ $#esmtp $@ [ $(dequote $2 $) ] $: $1 < @ [IPv6 : $2 ] > $3 no smarthost: send
R$* < @ [ $+ ] : > $* $#esmtp $@ [$2] $: $1 < @ [$2] > $3 no smarthost: send
R$* < @ [ $+ ] : $- : $*> $* $#$3 $@ $4 $: $1 < @ [$2] > $5 smarthost with mailer
R$* < @ [ $+ ] : $+ > $* $#esmtp $@ $3 $: $1 < @ [$2] > $4 smarthost without mailer
@@ -786,7 +785,7 @@
R< $- : $+ @ $+ > $*<$*>$* $# $1 $@ $3 $: $2<@$3> use literal user
R< $- : $+ > $* $# $1 $@ $2 $: $3 try qualified mailer
R< $=w > $* $@ $2 delete local host
-R< [ IPv6 $+ ] > $* $#relay $@ $(dequote $1 $) $: $2 use unqualified mailer
+R< [ IPv6 : $+ ] > $* $#relay $@ $(dequote $1 $) $: $2 use unqualified mailer
R< $+ > $* $#relay $@ $1 $: $2 use unqualified mailer
###################################################################
@@ -960,7 +959,7 @@
$: < ? $&{client_name} > < $1 @ localhost.UUCP >
R<@> $* $: $1 no localhost as domain
R<? $=w> $* $: $2 local client: ok
-R<? $+> <$+> $#error $@ 5.5.4 $: "501 Real domain name required for sender address"
+R<? $+> <$+> $#error $@ 5.5.4 $: "553 Real domain name required for sender address"
R<?> $* $: $1
R$* $: <?> $>CanonAddr $1 canonify sender address and mark it
R<?> $* < @ $+ . > <?> $1 < @ $2 > strip trailing dots
@@ -977,13 +976,13 @@
R$* $| $* $: $2
R<?> $* $: < ? $&{client_name} > $1
R<?> $* $@ <OK> ...local unqualed ok
-R<? $+> $* $#error $@ 5.5.4 $: "501 Domain name required for sender address " $&f
+R<? $+> $* $#error $@ 5.5.4 $: "553 Domain name required for sender address " $&f
...remote is not
# check results
R<?> $* $: @ $1 mark address: nothing known about it
R<OK> $* $@ <OK>
R<TEMP> $* $#error $@ 4.1.8 $: "451 Domain of sender address " $&f " does not resolve"
-R<PERM> $* $#error $@ 5.1.8 $: "501 Domain of sender address " $&f " does not exist"
+R<PERM> $* $#error $@ 5.1.8 $: "553 Domain of sender address " $&f " does not exist"
######################################################################
### check_rcpt -- check SMTP `RCPT TO:' command argument
Home |
Main Index |
Thread Index |
Old Index