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 Pull up revisions 1.6-1.7 (requested ...
details: https://anonhg.NetBSD.org/src/rev/189f48f2617a
branches: netbsd-1-5
changeset: 492790:189f48f2617a
user: he <he%NetBSD.org@localhost>
date: Wed Feb 20 23:12:14 2002 +0000
description:
Pull up revisions 1.6-1.7 (requested by itojun):
Upgrade to sendmail version 8.11.6.
diffstat:
gnu/dist/sendmail/cf/m4/proto.m4 | 61 +++++++++++---------
gnu/dist/sendmail/devtools/README | 10 +-
gnu/dist/sendmail/devtools/bin/Build | 92 +++++++++++++++++--------------
gnu/dist/sendmail/libmilter/libmilter.h | 7 +-
gnu/dist/sendmail/libmilter/sm_gethost.c | 21 ++++--
5 files changed, 108 insertions(+), 83 deletions(-)
diffs (truncated from 481 to 300 lines):
diff -r f137a11141e4 -r 189f48f2617a gnu/dist/sendmail/cf/m4/proto.m4
--- a/gnu/dist/sendmail/cf/m4/proto.m4 Wed Feb 20 23:12:09 2002 +0000
+++ b/gnu/dist/sendmail/cf/m4/proto.m4 Wed Feb 20 23:12:14 2002 +0000
@@ -13,7 +13,7 @@
#
divert(0)
-VERSIONID(`Id: proto.m4,v 8.446.2.5.2.38 2000/12/28 03:37:28 ca Exp')
+VERSIONID(`Id: proto.m4,v 8.446.2.5.2.44 2001/07/31 22:25:49 gshapiro Exp')
MAILER(local)dnl
@@ -77,6 +77,7 @@
define(`_U_',ifdef(`_DELAY_CHECKS_',`',`_'))
dnl default relaying denied message
ifdef(`confRELAY_MSG', `', `define(`confRELAY_MSG', `"550 Relaying denied"')')
+define(`CODE553', `553')
divert(0)dnl
# override file safeties - setting this option compromises system security,
@@ -160,8 +161,10 @@
# Resolve map (to check if a host exists in check_mail)
Kresolve host -a<OK> -T<TEMP>')
-ifdef(`_FFR_5_', `# macro storage map
-Kmacro macro')
+ifdef(`_NEED_MACRO_MAP_', `dnl
+ifdef(`_MACRO_MAP_', `', `# macro storage map
+define(`_MACRO_MAP_', `1')dnl
+Kmacro macro')', `dnl')
ifdef(`confCR_FILE', `dnl
# Hosts for which relaying is permitted ($=R)
@@ -221,7 +224,7 @@
_OPTION(SevenBitInput, `confSEVEN_BIT_INPUT', `False')
# 8-bit data handling
-_OPTION(EightBitMode, `confEIGHT_BIT_HANDLING', `adaptive')
+_OPTION(EightBitMode, `confEIGHT_BIT_HANDLING', `pass8')
# wait for alias file rebuild (default units: minutes)
_OPTION(AliasWait, `confALIAS_WAIT', `5m')
@@ -630,7 +633,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
@@ -706,9 +709,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]
@@ -867,26 +870,26 @@
SParse0
R<@> $@ <@> special case error msgs
-R$* : $* ; <@> $#error $@ 5.1.3 $: "501 List:; syntax illegal for recipient addresses"
+R$* : $* ; <@> $#error $@ 5.1.3 $: "CODE553 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 $: "CODE553 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 $: "CODE553 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$* < @ . $* > $* $#error $@ 5.1.2 $: "CODE553 Invalid host name"
+R$* < @ $* .. $* > $* $#error $@ 5.1.2 $: "CODE553 Invalid host name"
dnl comma only allowed before @; this check is not complete
-R$* , $~O $* $#error $@ 5.1.2 $: "501 Invalid route address"
+R$* , $~O $* $#error $@ 5.1.2 $: "CODE553 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 $: "CODE553 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 $: "CODE553 User address required"
R$* $=O $* < @ *LOCAL* >
$@ $>Parse0 $>canonify $1 $2 $3 ...@*LOCAL* -> ...
R$* < @ *LOCAL* > $: $1
@@ -906,8 +909,8 @@
dnl there is no check whether this is really an IP number
R$* < @ [ $+ ] > $* $: $>ParseLocal $1 < @ [ $2 ] > $3 numeric internet spec
R$* < @ [ $+ ] > $* $1 < @ [ $2 ] : $S > $3 Add smart host to path
-R$* < @ [ IPv6 $- ] : > $*
- $#_SMTP_ $@ [ $(dequote $2 $) ] $: $1 < @ [IPv6 $2 ] > $3 no smarthost: send
+R$* < @ [ IPv6 : $+ ] : > $*
+ $#_SMTP_ $@ [ $(dequote $2 $) ] $: $1 < @ [IPv6 : $2 ] > $3 no smarthost: send
R$* < @ [ $+ ] : > $* $#_SMTP_ $@ [$2] $: $1 < @ [$2] > $3 no smarthost: send
R$* < @ [ $+ ] : $- : $*> $* $#$3 $@ $4 $: $1 < @ [$2] > $5 smarthost with mailer
R$* < @ [ $+ ] : $+ > $* $#_SMTP_ $@ $3 $: $1 < @ [$2] > $4 smarthost without mailer',
@@ -935,8 +938,12 @@
R<!> $+ $: $1
R< error : $-.$-.$- : $+ > $* $#error $@ $1.$2.$3 $: $4
R< error : $- $+ > $* $#error $@ $(dequote $1 $) $: $2
-R< $+ > $+ < @ $+ > $: $>Recurse $1',
-`dnl')
+dnl this is not a documented option
+dnl it performs no looping at all for virtusertable
+ifdef(`_NO_VIRTUSER_RECURSION_',
+`R< $+ > $+ < @ $+ > $: $>ParseLocal $>Parse0 $>canonify $1',
+`R< $+ > $+ < @ $+ > $: $>Recurse $1')
+dnl', `dnl')
# short circuit local delivery so forwarded email works
ifdef(`_MAILER_usenet_', `dnl
@@ -1013,7 +1020,7 @@
# deal with other remote names
ifdef(`_MAILER_smtp_',
`R$* < @$* > $* $#_SMTP_ $@ $2 $: $1 < @ $2 > $3 user@host.domain',
-`R$* < @$* > $* $#error $@ 5.1.2 $: "501 Unrecognized host name " $2')
+`R$* < @$* > $* $#error $@ 5.1.2 $: "CODE553 Unrecognized host name " $2')
# handle locally delivered names
R$=L $#_LOCAL_ $: @ $1 special local names
@@ -1101,7 +1108,7 @@
dnl <mailer:user@host> lp<@domain>rest -> mailer host user
dnl <mailer:host> address -> mailer host address
dnl <localdomain> address -> address
-dnl <[IPv6 number]> address -> relay number address
+dnl <[IPv6:number]> address -> relay number address
dnl <host> address -> relay host address
###################################################################
@@ -1113,7 +1120,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
###################################################################
@@ -1277,7 +1284,7 @@
SLookUpDomain
dnl remove IPv6 mark and dequote address
dnl it is a bit ugly because it is checked on each "iteration"
-R<[IPv6 $-]> <$+> <$*> <$*> $: <[$(dequote $1 $)]> <$2> <$3> <$4>
+R<[IPv6 : $+]> <$+> <$*> <$*> $: <[$(dequote $1 $)]> <$2> <$3> <$4>
dnl workspace <key> <default> <passthru> <mark>
dnl lookup with tag (in front, no delimiter here)
R<$*> <$+> <$*> <$- $-> $: < $(access $5`'_TAG_DELIM_`'$1 $: ? $) > <$1> <$2> <$3> <$4 $5>
@@ -1522,7 +1529,7 @@
dnl or: <address>
dnl or: <?> <address> (thanks to u in ${daemon_flags})
R<? $=w> $* $: $2 local client: ok
-R<? $+> <$+> $#error $@ 5.5.4 $: "501 Real domain name required for sender address"
+R<? $+> <$+> $#error $@ 5.5.4 $: "CODE553 Real domain name required for sender address"
dnl remove <?> (happens only if ${client_name} == "" or u in ${daemon_flags})
R<?> $* $: $1')
dnl workspace: address (or <address>)
@@ -1572,13 +1579,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 $: "CODE553 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 $: "CODE553 Domain of sender address " $&f " does not exist"
ifdef(`_ACCESS_TABLE_', `dnl
R<$={Accept}> $* $# $1
R<DISCARD> $* $#discard $: discard
diff -r f137a11141e4 -r 189f48f2617a gnu/dist/sendmail/devtools/README
--- a/gnu/dist/sendmail/devtools/README Wed Feb 20 23:12:09 2002 +0000
+++ b/gnu/dist/sendmail/devtools/README Wed Feb 20 23:12:14 2002 +0000
@@ -136,7 +136,7 @@
confMAN1SRC 0 The source for man pages installed
in confMAN1.
confMAN3 confMANROOT 3 The location of man3 files.
-confMAN3EXT 4 The extension on files in confMAN3.
+confMAN3EXT 3 The extension on files in confMAN3.
confMAN3SRC 0 The source for man pages installed
in confMAN3.
confMAN4 confMANROOT 4 The location of man4 files.
@@ -186,7 +186,7 @@
confRANLIBOPTS [empty] Options to pass to ranlib.
confSBINDIR /usr/sbin The location of root-oriented
commands, such as makemap.
-confSBINGRP sbin The group for setuid binaries.
+confSBINGRP bin The group for setuid binaries.
confSBINMODE 4555 The mode for setuid binaries.
confSBINOWN root The owner for setuid binaries.
confSHAREDLIB_EXT .so Shared library file extenion name.
@@ -330,8 +330,8 @@
files that make up the executable.
bldBIN_TYPE - This determines where the binaries will be installed and what
-permissions they will have. Available types are `U', `K', `S', and `E'. See
-M4/make/executable.m4 for what the different types mean.
+permissions they will have. Available types are `U', `K', `S', and `E'.
+See M4/UNIX/make/executable.m4 for what the different types mean.
bldTARGET_LINKS - This determines where additional symbolic links to the
executable are placed. These should be full pathnames, separated by
@@ -358,4 +358,4 @@
bldINSTALLABLE - This should be set if the library should be installed in
confLIBDIR.
-Revision: 8.65.4.7, Last updated Date: 2001/02/11 19:45:51
+Revision: 8.65.4.9, Last updated Date: 2001/05/30 19:50:37
diff -r f137a11141e4 -r 189f48f2617a gnu/dist/sendmail/devtools/bin/Build
--- a/gnu/dist/sendmail/devtools/bin/Build Wed Feb 20 23:12:09 2002 +0000
+++ b/gnu/dist/sendmail/devtools/bin/Build Wed Feb 20 23:12:14 2002 +0000
@@ -11,7 +11,7 @@
# the sendmail distribution.
#
#
-# Id: Build,v 8.155.4.7 2001/01/22 19:00:15 gshapiro Exp
+# Id: Build,v 8.155.4.11 2001/08/16 02:13:48 geir Exp
#
#
@@ -86,8 +86,8 @@
arg=`echo $1 | sed 's/^-E//'`
if [ -z "$arg" ]
then
- shift # move to argument
- arg=$1
+ shift # move to argument
+ arg=$1
fi
if [ -z "$arg" ]
then
@@ -126,8 +126,8 @@
arg=`echo $1 | sed 's/^-f//'`
if [ -z "$arg" ]
then
- shift # move to argument
- arg=$1
+ shift # move to argument
+ arg=$1
fi
if [ "$pfx" ]
then
@@ -167,8 +167,8 @@
arg="`echo $1 | sed 's/^-O//'`"
if [ -z "$arg" ]
then
- shift # move to argument
- arg="$1"
+ shift # move to argument
+ arg="$1"
fi
case $arg
in
@@ -195,8 +195,8 @@
arg=`echo $1 | sed 's/^-Q//'`
if [ -z "$arg" ]
then
- shift # move to argument
- arg=$1
+ shift # move to argument
+ arg=$1
fi
if [ -z "$arg" ]
then
@@ -221,10 +221,10 @@
shift
build_variant=$1
if [ -z "$build_variant" ]
- then
- echo "Usage error with \"-v\" <build_variant>" >&2
- echo "You must specify exactly one build variant of debug|optimized|purify" >&2
- exit $EX_USAGE
+ then
+ echo "Usage error with \"-v\" <build_variant>" >&2
+ echo "You must specify exactly one build variant of debug|optimized|purify" >&2
+ exit $EX_USAGE
fi
shift
;;
@@ -239,20 +239,20 @@
# process selected build variant.
case $build_variant in
- debug)
Home |
Main Index |
Thread Index |
Old Index