Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 10 Apr 2002 03:28:50 -0700 (PDT)
From:      Peter Wemm <peter@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 9500 for review
Message-ID:  <200204101028.g3AASoJ32242@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=9500

Change 9500 by peter@peter_daintree on 2002/04/10 03:28:15

	IFC @9499

Affected files ...

... //depot/projects/ia64/contrib/sendmail/FREEBSD-upgrade#6 integrate
... //depot/projects/ia64/contrib/sendmail/KNOWNBUGS#3 integrate
... //depot/projects/ia64/contrib/sendmail/RELEASE_NOTES#3 integrate
... //depot/projects/ia64/contrib/sendmail/cf/README#3 integrate
... //depot/projects/ia64/contrib/sendmail/cf/cf/README#2 integrate
... //depot/projects/ia64/contrib/sendmail/cf/cf/submit.cf#2 integrate
... //depot/projects/ia64/contrib/sendmail/cf/cf/submit.mc#2 integrate
... //depot/projects/ia64/contrib/sendmail/cf/feature/access_db.m4#3 integrate
... //depot/projects/ia64/contrib/sendmail/cf/feature/compat_check.m4#2 integrate
... //depot/projects/ia64/contrib/sendmail/cf/feature/ldap_routing.m4#3 integrate
... //depot/projects/ia64/contrib/sendmail/cf/feature/msp.m4#2 integrate
... //depot/projects/ia64/contrib/sendmail/cf/m4/proto.m4#3 integrate
... //depot/projects/ia64/contrib/sendmail/cf/m4/version.m4#3 integrate
... //depot/projects/ia64/contrib/sendmail/cf/ostype/darwin.m4#3 integrate
... //depot/projects/ia64/contrib/sendmail/contrib/buildvirtuser#3 integrate
... //depot/projects/ia64/contrib/sendmail/contrib/qtool.8#3 integrate
... //depot/projects/ia64/contrib/sendmail/contrib/qtool.pl#3 integrate
... //depot/projects/ia64/contrib/sendmail/contrib/smcontrol.pl#2 integrate
... //depot/projects/ia64/contrib/sendmail/doc/op/op.me#3 integrate
... //depot/projects/ia64/contrib/sendmail/editmap/editmap.c#2 integrate
... //depot/projects/ia64/contrib/sendmail/include/libmilter/mfapi.h#3 integrate
... //depot/projects/ia64/contrib/sendmail/include/libmilter/milter.h#3 integrate
... //depot/projects/ia64/contrib/sendmail/include/sm/cdefs.h#2 integrate
... //depot/projects/ia64/contrib/sendmail/include/sm/conf.h#2 integrate
... //depot/projects/ia64/contrib/sendmail/include/sm/config.h#2 integrate
... //depot/projects/ia64/contrib/sendmail/include/sm/gen.h#2 integrate
... //depot/projects/ia64/contrib/sendmail/include/sm/io.h#2 integrate
... //depot/projects/ia64/contrib/sendmail/include/sm/ldap.h#2 integrate
... //depot/projects/ia64/contrib/sendmail/include/sm/os/sm_os_freebsd.h#2 integrate
... //depot/projects/ia64/contrib/sendmail/libmilter/Makefile.m4#3 integrate
... //depot/projects/ia64/contrib/sendmail/libmilter/comm.c#3 integrate
... //depot/projects/ia64/contrib/sendmail/libmilter/docs/installation.html#2 integrate
... //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_setbacklog.html#1 branch
... //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_setreply.html#2 integrate
... //depot/projects/ia64/contrib/sendmail/libmilter/engine.c#3 integrate
... //depot/projects/ia64/contrib/sendmail/libmilter/listener.c#3 integrate
... //depot/projects/ia64/contrib/sendmail/libmilter/main.c#3 integrate
... //depot/projects/ia64/contrib/sendmail/libmilter/signal.c#3 integrate
... //depot/projects/ia64/contrib/sendmail/libmilter/smfi.c#3 integrate
... //depot/projects/ia64/contrib/sendmail/libsm/README#2 integrate
... //depot/projects/ia64/contrib/sendmail/libsm/clock.c#2 integrate
... //depot/projects/ia64/contrib/sendmail/libsm/config.c#2 integrate
... //depot/projects/ia64/contrib/sendmail/libsm/debug.html#2 integrate
... //depot/projects/ia64/contrib/sendmail/libsm/fclose.c#2 integrate
... //depot/projects/ia64/contrib/sendmail/libsm/findfp.c#2 integrate
... //depot/projects/ia64/contrib/sendmail/libsm/ldap.c#2 integrate
... //depot/projects/ia64/contrib/sendmail/libsm/local.h#2 integrate
... //depot/projects/ia64/contrib/sendmail/libsm/mbdb.c#2 integrate
... //depot/projects/ia64/contrib/sendmail/libsm/smstdio.c#2 integrate
... //depot/projects/ia64/contrib/sendmail/libsm/sscanf.c#2 integrate
... //depot/projects/ia64/contrib/sendmail/libsm/stdio.c#2 integrate
... //depot/projects/ia64/contrib/sendmail/libsm/strio.c#2 integrate
... //depot/projects/ia64/contrib/sendmail/libsm/strl.c#2 integrate
... //depot/projects/ia64/contrib/sendmail/libsm/t-event.c#2 integrate
... //depot/projects/ia64/contrib/sendmail/libsm/t-fopen.c#2 integrate
... //depot/projects/ia64/contrib/sendmail/libsm/t-shm.c#2 integrate
... //depot/projects/ia64/contrib/sendmail/libsm/t-types.c#2 integrate
... //depot/projects/ia64/contrib/sendmail/libsm/vsscanf.c#2 integrate
... //depot/projects/ia64/contrib/sendmail/libsm/wsetup.c#2 integrate
... //depot/projects/ia64/contrib/sendmail/libsmdb/smdb.c#3 integrate
... //depot/projects/ia64/contrib/sendmail/libsmdb/smdb1.c#3 integrate
... //depot/projects/ia64/contrib/sendmail/libsmdb/smndbm.c#3 integrate
... //depot/projects/ia64/contrib/sendmail/mail.local/Makefile.m4#3 integrate
... //depot/projects/ia64/contrib/sendmail/mail.local/mail.local.c#3 integrate
... //depot/projects/ia64/contrib/sendmail/mailstats/mailstats.8#3 integrate
... //depot/projects/ia64/contrib/sendmail/smrsh/Makefile.m4#3 integrate
... //depot/projects/ia64/contrib/sendmail/src/README#3 integrate
... //depot/projects/ia64/contrib/sendmail/src/SECURITY#2 integrate
... //depot/projects/ia64/contrib/sendmail/src/TUNING#2 integrate
... //depot/projects/ia64/contrib/sendmail/src/bf.c#2 integrate
... //depot/projects/ia64/contrib/sendmail/src/collect.c#3 integrate
... //depot/projects/ia64/contrib/sendmail/src/conf.c#3 integrate
... //depot/projects/ia64/contrib/sendmail/src/conf.h#3 integrate
... //depot/projects/ia64/contrib/sendmail/src/control.c#3 integrate
... //depot/projects/ia64/contrib/sendmail/src/daemon.c#3 integrate
... //depot/projects/ia64/contrib/sendmail/src/deliver.c#3 integrate
... //depot/projects/ia64/contrib/sendmail/src/domain.c#3 integrate
... //depot/projects/ia64/contrib/sendmail/src/envelope.c#3 integrate
... //depot/projects/ia64/contrib/sendmail/src/helpfile#3 integrate
... //depot/projects/ia64/contrib/sendmail/src/main.c#3 integrate
... //depot/projects/ia64/contrib/sendmail/src/map.c#3 integrate
... //depot/projects/ia64/contrib/sendmail/src/mci.c#3 integrate
... //depot/projects/ia64/contrib/sendmail/src/milter.c#3 integrate
... //depot/projects/ia64/contrib/sendmail/src/mime.c#3 integrate
... //depot/projects/ia64/contrib/sendmail/src/parseaddr.c#3 integrate
... //depot/projects/ia64/contrib/sendmail/src/queue.c#3 integrate
... //depot/projects/ia64/contrib/sendmail/src/readcf.c#3 integrate
... //depot/projects/ia64/contrib/sendmail/src/sasl.c#2 integrate
... //depot/projects/ia64/contrib/sendmail/src/sendmail.h#3 integrate
... //depot/projects/ia64/contrib/sendmail/src/sfsasl.c#3 integrate
... //depot/projects/ia64/contrib/sendmail/src/srvrsmtp.c#3 integrate
... //depot/projects/ia64/contrib/sendmail/src/stats.c#3 integrate
... //depot/projects/ia64/contrib/sendmail/src/tls.c#2 integrate
... //depot/projects/ia64/contrib/sendmail/src/usersmtp.c#3 integrate
... //depot/projects/ia64/contrib/sendmail/src/util.c#3 integrate
... //depot/projects/ia64/contrib/sendmail/src/version.c#3 integrate
... //depot/projects/ia64/contrib/sendmail/vacation/vacation.1#3 integrate
... //depot/projects/ia64/contrib/sendmail/vacation/vacation.c#3 integrate
... //depot/projects/ia64/etc/defaults/periodic.conf#3 integrate
... //depot/projects/ia64/etc/periodic/daily/440.status-mailq#2 integrate
... //depot/projects/ia64/etc/periodic/daily/500.queuerun#2 integrate
... //depot/projects/ia64/gnu/usr.bin/Makefile#8 integrate
... //depot/projects/ia64/gnu/usr.bin/cc/cc1/Makefile#5 integrate
... //depot/projects/ia64/gnu/usr.bin/cc/cc1obj/Makefile#5 integrate
... //depot/projects/ia64/gnu/usr.bin/cc/cc1plus/Makefile#4 integrate
... //depot/projects/ia64/gnu/usr.bin/cc/collect2/Makefile#4 integrate
... //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#18 integrate
... //depot/projects/ia64/share/man/man5/make.conf.5#5 integrate
... //depot/projects/ia64/share/man/man5/periodic.conf.5#5 integrate
... //depot/projects/ia64/share/mk/bsd.sys.mk#5 integrate
... //depot/projects/ia64/sys/dev/digi/CX.c#2 integrate
... //depot/projects/ia64/sys/dev/digi/CX_PCI.c#2 integrate
... //depot/projects/ia64/sys/dev/digi/EPCX.c#2 integrate
... //depot/projects/ia64/sys/dev/digi/EPCX_PCI.c#2 integrate
... //depot/projects/ia64/sys/dev/digi/Xe.c#2 integrate
... //depot/projects/ia64/sys/dev/digi/Xem.c#2 integrate
... //depot/projects/ia64/sys/dev/digi/Xr.c#2 integrate
... //depot/projects/ia64/sys/dev/digi/digi.c#7 integrate
... //depot/projects/ia64/sys/dev/pci/pci.c#4 integrate
... //depot/projects/ia64/sys/dev/snp/snp.c#7 integrate
... //depot/projects/ia64/sys/kern/kern_linker.c#13 integrate
... //depot/projects/ia64/sys/kern/kern_time.c#5 integrate
... //depot/projects/ia64/sys/kern/subr_witness.c#8 integrate
... //depot/projects/ia64/sys/net/if.c#7 integrate
... //depot/projects/ia64/sys/netinet/in.c#5 integrate
... //depot/projects/ia64/sys/sys/ioccom.h#5 integrate
... //depot/projects/ia64/sys/sys/linker.h#3 integrate
... //depot/projects/ia64/sys/vm/uma_core.c#7 integrate
... //depot/projects/ia64/usr.bin/awk/Makefile#5 integrate
... //depot/projects/ia64/usr.bin/yacc/output.c#7 integrate
... //depot/projects/ia64/usr.bin/yacc/reader.c#7 integrate

Differences ...

==== //depot/projects/ia64/contrib/sendmail/FREEBSD-upgrade#6 (text+ko) ====

@@ -1,6 +1,6 @@
-$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.12 2002/04/09 02:09:14 gshapiro Exp $
+$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.14 2002/04/10 05:16:45 gshapiro Exp $
 
-sendmail 8.12.2
+sendmail 8.12.3
 	originals can be found at: ftp://ftp.sendmail.org/pub/sendmail/
 
 For the import of sendmail, the following files were removed:
@@ -21,8 +21,8 @@
 
 Imported using:
 
-	cvs import -m 'Import sendmail 8.12.2' \
-		src/contrib/sendmail SENDMAIL v8_12_2
+	cvs import -m 'Import sendmail 8.12.3' \
+		src/contrib/sendmail SENDMAIL v8_12_3
 
 
 To make local changes to sendmail, simply patch and commit to the main
@@ -40,6 +40,7 @@
 	contrib/sendmail/
 	etc/Makefile
 	etc/defaults/make.conf (RELENG_4)
+	etc/defaults/periodic.conf
 	etc/defaults/rc.conf
 	etc/mail/Makefile
 	etc/mail/README
@@ -71,6 +72,7 @@
 	share/doc/smm/08.sendmailop/Makefile
 	share/examples/etc/make.conf (HEAD)
 	share/man/man5/make.conf.5
+	share/man/man5/periodic.conf.5
 	share/man/man5/rc.conf.5
 	share/man/man7/hier.7
 	share/man/man8/Makefile
@@ -88,4 +90,4 @@
 	usr.sbin/mailwrapper/Makefile
 
 gshapiro@FreeBSD.org
-17-February-2002
+9-April-2002

==== //depot/projects/ia64/contrib/sendmail/KNOWNBUGS#3 (text+ko) ====

@@ -41,6 +41,25 @@
   characters then no header check is done even if one is configured for
   the header.
 
+* Sender addresses whose domain part cause a temporary A record lookup
+  failure but have a valid MX record will be temporarily rejected in
+  the default configuration.  Solution: fix the DNS at the sender side.
+  If that's not easy to achieve, possible workarounds are:
+  - add an entry to the access map:
+	dom.ain	OK
+  - (only for advanced users) replace
+
+# Resolve map (to check if a host exists in check_mail)
+Kresolve host -a<OKR> -T<TEMP>
+
+   with
+
+# Resolve map (to check if a host exists in check_mail)
+Kcanon host -a<OKR> -T<TEMP>
+Kdnsmx dns -R MX -a<OKR> -T<TEMP>
+Kresolve sequence dnsmx canon
+
+
 * Duplicate error messages.
 
   Sometimes identical, duplicate error messages can be generated.  As
@@ -216,4 +235,4 @@
   the file.  This is unavoidable as sendmail must verify the file is safe
   to open before opening it.  A file can not be locked until it is open.
 
-$Revision: 8.54 $, Last updated $Date: 2001/12/17 16:07:51 $
+$Revision: 8.55 $, Last updated $Date: 2002/03/05 00:45:54 $

==== //depot/projects/ia64/contrib/sendmail/RELEASE_NOTES#3 (text+ko) ====

@@ -1,11 +1,190 @@
 			SENDMAIL RELEASE NOTES
-      $Id: RELEASE_NOTES,v 8.1218 2002/01/13 18:24:15 ca Exp $
+      $Id: RELEASE_NOTES,v 8.1296 2002/04/05 19:17:34 ca Exp $
 
 
 This listing shows the version of the sendmail binary, the version
 of the sendmail configuration files, the date of release, and a
 summary of the changes in that release.
 
+8.12.3/8.12.3	2002/04/05
+	NOTICE: In general queue files should not be moved if queue groups
+		are used.  In previous versions this could cause mail
+		not to be delivered if a queue file is repeatedly moved
+		by an external process whenever sendmail moved it back
+		into the right place.  Some precautions have been taken
+		to avoid moving queue files if not really necessary.
+		sendmail may use links to refer to queue files and it
+		may store the path of data files in queue files.  Hence
+		queue files should not be moved unless those internals
+		are understood and the integrity of the files is not
+		compromised.  Problem noted by Anne Bennett of Concordia
+		University.
+	If an error mail is created, and the mail is split across different
+		queue directories, and SuperSafe is off, then write the mail
+		to disk before splitting it, otherwise an assertion is
+		triggered.  Problem tracked down by Henning Schmiedehausen
+		of INTERMETA.
+	Fix possible race condition that could cause sendmail to forget
+		running queues.  Problem noted by Jeff Wasilko of smoe.org.
+	Handle bogus qf files better without triggering assertions.
+		Problem noted by Guy Feltin.
+	Protect against interrupted select() call when enforcing Milter
+		read and write timeouts.  Patch from Gurusamy Sarathy of
+		ActiveState.
+	Matching queue IDs with -qI should be case sensitive.  Problem
+		noted by Anne Bennett of Concordia University.
+	If privileges have been dropped, don't try to change group ID to
+		the RunAsUser group.  Problem noted by Neil Rickert of
+		Northern Illinois University.
+	Fix SafeFileEnvironment path munging when the specified path
+		contains a trailing slash.  Based on patch from Dirk Meyer
+		of Dinoex.
+	Do not limit sendmail command line length to SM_ARG_MAX (usually
+		4096).  Problem noted by Allan E Johannesen of Worcester
+		Polytechnic Institute.
+	Clear full name of sender for each new envelope to avoid bogus data
+		if several mails are sent in one session and some of them
+		do not have a From: header.  Problem noted by Bas Haakman.
+	Change timeout check such that cached information about a connection
+		will be immediately invalid if ConnectionCacheTimeout is zero.
+		Based on patch from David Burns of Portland State University.
+	Properly count message size for mailstats during mail collection.
+		Problem noted by Werner Wiethege.
+	Log complete response from LMTP delivery agent on failure.  Based on
+		patch from by Motonori Nakamura of Kyoto University.
+	Provide workaround for getopt() implementations that do not catch
+		missing arguments.
+	Fix the message size calculation if the message body is replaced by
+		a milter filter and buffered file I/O is being used.
+		Problem noted by Sergey Akhapkin of Dr.Web.
+	Do not honor SIGUSR1 requests if running with extra privileges.
+		Problem noted by Werner Wiethege.
+	Prevent a file descriptor leak on mail delivery if the initial
+		connect fails and DialDelay is set.  Patch from Servaas
+		Vandenberghe of Katholieke Universiteit Leuven.
+	Properly deal with a case where sendmail is called by root running
+		a set-user-ID (non-root) program.  Problem noted by Jon
+		Lusky of ISS Atlanta.
+	Avoid leaving behind stray transcript (xf) files if multiple queue
+		directories are used and mail is sent to a mailing list
+		which has an owner- alias.  Problem noted by Anne Bennett
+		of Concordia University.
+	Fix class map parsing code if optional key is specified.  Problem
+		found by Mario Nigrovic.
+	The SMTP daemon no longer tries to fix up improperly dot-stuffed
+		incoming messages.  A leading dot is always stripped by the
+		SMTP receiver regardless of whether or not it is followed by
+		another dot.  Problem noted by Jordan Ritter of darkridge.com.
+	Fix corruption when doing automatic MIME 7-bit quoted-printable or
+		base64 encoding to 8-bit text.  Problem noted by Mark
+		Elvers.
+	Correct the statistics gathered for total number of connections.
+		Instead of being the exact same number as the total number
+		of messages (T line in mailstats) it now represents the
+		total number of TCP connections.
+	Be more explicit about syntax errors in addresses, especially
+		non-ASCII characters, and properly create DSNs if necessary.
+		Problem noted by Leena Heino of the University of Tampere.
+	Prevent small timeouts from being lost on slow machines if itimers
+		are used.  Problem noted by Suresh Ramasubramanian.
+	Prevent a race condition on child cleanup for delivery to files.
+		Problem noted by Fletcher Mattox of the University of
+		Texas.
+	Change the SMTP error code for temporary map failures from 421
+		to 451.
+	Do not assume that realloc(NULL, size) works on all OS (this was
+		only done in one place: queue group creation).  Based on
+		patch by Bryan Costales.
+	Initialize Timeout.iconnect in the code to prevent randomly short
+		timeouts.  Problem noted by Bradley Watts of AT&T Canada.
+	Do not try to send a second SMTP QUIT command if the remote
+		responds to a MAIL command with a 421 reply or on I/O
+		errors.  By doing so, the host was marked as having a
+		temporary problem and other mail destined for that host was
+		queued for the next queue run.  Problem noted by Fletcher
+		Mattox of the University of Texas, Allan E Johannesen of
+		Worcester Polytechnic Institute, Larry Greenfield of CMU,
+		and Neil Rickert of Northern Illinois University.
+	Ignore error replies from the SMTP QUIT command (including servers
+		which drop the connection instead of responding to the
+		command).
+	Portability:
+		Check LDAP_API_VERSION to determine if ldap_memfree() is
+			availble.
+		Define HPUX10 when building on HP-UX 10.X.  That platform
+			now gets the proper _PATH_SENDMAIL and SMRSH_CMDDIR
+			settings.  Patch from Elias Halldor Agustsson of
+			Skyrr.
+		Fix dependency building on Mac OS X and Darwin.  Problem
+			noted by John Beck.
+		Preliminary support for the sparc64 port of FreeBSD 5.0.
+		Add /sbin/sh as an acceptable user shell on HP-UX.  From
+			Rajesh Somasund of Hewlett-Packard.
+	CONFIG: Add FEATURE(`authinfo') to allow a separate database for
+		SMTP AUTH information.  This feature was actually added in
+		8.12.0 but a release note was not included.
+	CONFIG: Do not bounce mail if FEATURE(`ldap_routing')'s bounce
+		parameter is set and the LDAP lookup returns a temporary
+		error.
+	CONFIG: Honor FEATURE(`relay_hosts_only') when using
+		FEATURE(`relay_mail_from', `domain').  Problem noted by
+		Krzysztof Oledzki.
+	CONFIG: FEATURE(`msp') now disables any type of alias
+		initialization as aliases are not needed for the MSP.
+	CONFIG: Allow users to override RELAY_MAILER_ARGS when FEATURE(`msp')
+		is in use.  Patch from Andrzej Filip.
+	CONFIG: FEATURE(`msp') uses `[localhost]' as default instead of
+		`localhost' and turns on MX lookups for the SMTP mailers.
+		This will only have an effect if a parameter is specified,
+		i.e., an MX lookup will be performed on the hostname unless
+		it is embedded in square brackets.  Problem noted by
+		Theo Van Dinter of Collective Technologies.
+	CONFIG: Set confTIME_ZONE to USE_TZ in submit.mc (TimeZoneSpec= in
+		submit.cf) to use $TZ for time stamps.  This is a compromise
+		to allow for the proper time zone on systems where the
+		default results in misleading time stamps. That is, syslog
+		time stamps and Date headers on submitted mail will use the
+		user's $TZ setting.  Problem noted by Mark Roth of the
+		University of Illinois at Urbana-Champaign, solution proposed
+		by Neil Rickert of Northern Illinois University.
+	CONFIG: Mac OS X (Darwin) ships with mail.local as non-set-user-ID
+		binary.  Adjust local mailer flags accordingly.  Problem
+		noted by John Beck.
+	CONTRIB: Add a warning to qtool.pl to not move queue files around
+		if queue groups are used.
+	CONTRIB: buildvirtuser: Add -f option to force rebuild.
+	CONTRIB: smcontrol.pl: Add -f option to specify control socket.
+	CONTRIB: smcontrol.pl: Add support for 'memdump' command.
+		Suggested by Bryan Costales.
+	DEVTOOLS: Add dependency generation for test programs.
+	LIBMILTER: Remove conversion of port number for the socket
+		structure that is passed to xxfi_connect().  Notice:
+		this fix requires that sendmail and libmilter have both
+		this change, mixing versions may lead to wrong port
+		values depending on the endianness of the involved systems.
+		Problem noted by Gisle Aas of ActiveState.
+	LIBMILTER: If smfi_setreply() sets a custom reply code of '4XX' but
+		SMFI_REJECT is returned, ignore the custom reply.  Do the
+		same if '5XX' is used and SMFI_TEMPFAIL is returned.
+	LIBMILTER: Install include files in ${INCLUDEDIR}/libmilter/ as
+		required by mfapi.h.  Problem noted by Jose Marcio Martins
+		da Cruz of Ecole Nationale Superieure des Mines de Paris.
+	LIBSM: Add SM_CONF_LDAP_MEMFREE as a configuration define.  Set
+		this to 1 if your LDAP client libraries include
+		ldap_memfree().
+	LIBSMDB: Avoid a file creation race condition for Berkeley DB 1.X
+		and NDBM on systems with the O_EXLOCK open(2) flag.
+	SMRSH: Fix compilation problem on some operating systems.  Problem
+		noted by Christian Krackowizer of schuler technodat GmbH.
+	VACATION: Allow root to operate on user vacation databases.  Based
+		on patch from Greg Couch of the University of California,
+		San Francisco.
+	VACATION: Don't ignore -C option.  Based on patch by Bryan Costales.
+	VACATION: Clarify option usage in the man page.  Problem noted by
+		Joe Barbish.
+	New Files:
+		libmilter/docs/smfi_setbacklog.html
+
 8.12.2/8.12.2	2002/01/13
 	Don't complain too much if stdin, stdout, or stderr are missing
 		at startup, only log an error message.

==== //depot/projects/ia64/contrib/sendmail/cf/README#3 (text+ko) ====

@@ -367,6 +367,9 @@
 SMTP_MAILER_MAXMSGS	[undefined] If defined, the maximum number of
 			messages to deliver in a single connection for the
 			smtp, smtp8, esmtp, or dsmtp mailers.
+SMTP_MAILER_MAXRCPTS	[undefined] If defined, the maximum number of
+			recipients to deliver in a single connection for the
+			smtp, smtp8, esmtp, or dsmtp mailers.
 SMTP_MAILER_ARGS	[TCP $h] The arguments passed to the smtp mailer.
 			About the only reason you would want to change this
 			would be to change the default port.
@@ -1084,6 +1087,9 @@
 		By default, only hosts listed as RELAY in the access db
 		will be allowed to relay.  This option also allows any
 		host in your domain as defined by class {m}.
+		Notice: make sure that your domain is not just a top level
+		domain, e.g., com.  This can happen if you give your
+		host a name like example.com instead of host.example.com.
 
 relay_hosts_only
 		By default, names that are listed as RELAY in the access
@@ -1274,11 +1280,13 @@
 		FEATURE and introduce new settings via DAEMON_OPTIONS().
 
 msp		Defines config file for Message Submission Program.
-		See sendmail/SECURITY for details and cf/cf/submit.mc
-		how to use it.  An optional argument can be used to
-		override the default of `localhost' to use as host to send
-		all e-mails to.  If `MSA' is specified as second argument
-		then port 587 is used to contact the server.  Example:
+		See sendmail/SECURITY for details and cf/cf/submit.mc how
+		to use it.  An optional argument can be used to override
+		the default of `[localhost]' to use as host to send all
+		e-mails to.  Note that MX records will be used if the
+		specified hostname is not in square brackets (e.g.,
+		[hostname]).  If `MSA' is specified as second argument then
+		port 587 is used to contact the server.  Example:
 
 			FEATURE(`msp', `', `MSA')
 
@@ -1298,6 +1306,9 @@
 		queue groups.  If an argument is specified, it is used
 		as default queue group.
 
+		Note: please read the warning in doc/op/op.me about
+		queue groups and possible queue manipulations.
+
 +-------+
 | HACKS |
 +-------+
@@ -1744,7 +1755,7 @@
 	sendmailMTAKey: bob
 	sendmailMTAAliasValue: eric
 
-	dn: sendmailMTAKey=bob, dc=sendmail, dc=org
+	dn: sendmailMTAKey=bobetrn, dc=sendmail, dc=org
 	objectClass: sendmailMTA
 	objectClass: sendmailMTAAlias
 	objectClass: sendmailMTAAliasObject
@@ -1973,19 +1984,21 @@
 
 The default <mailHost> map definition is:
 
-	ldap -1 -v mailHost -k (&(objectClass=inetLocalMailRecipient)
+	ldap -1 -T<TMPF> -v mailHost -k (&(objectClass=inetLocalMailRecipient)
 				 (mailLocalAddress=%0))
 
 The default <mailRoutingAddress> map definition is:
 
-	ldap -1 -v mailRoutingAddress -k (&(objectClass=inetLocalMailRecipient)
-					   (mailLocalAddress=%0))
+	ldap -1 -T<TMPF> -v mailRoutingAddress
+			 -k (&(objectClass=inetLocalMailRecipient)
+			      (mailLocalAddress=%0))
 
 Note that neither includes the LDAP server hostname (-h server) or base DN
 (-b o=org,c=COUNTRY), both necessary for LDAP queries.  It is presumed that
 your .mc file contains a setting for the confLDAP_DEFAULT_SPEC option with
 these settings.  If this is not the case, the map definitions should be
-changed as described above.
+changed as described above.  The "-T<TMPF>" is required in any user
+specified map definition to catch temporary errors.
 
 The following possibilities exist as a result of an LDAP lookup on an
 address:
@@ -2242,14 +2255,16 @@
 
 	spammer@aol.com			REJECT
 	cyberspammer.com		REJECT
+	TLD				REJECT
 	192.168.212			REJECT
 	IPv6:2002:c0a8:02c7		RELAY
 	IPv6:2002:c0a8:51d2::23f4	REJECT
 
 would refuse mail from spammer@aol.com, any user from cyberspammer.com
-(or any host within the cyberspammer.com domain), any host on the
-192.168.212.* network, and the IPv6 address 2002:c0a8:51d2::23f4.  It would
-allow relay for the IPv6 network 2002:c0a8:02c7::/48.
+(or any host within the cyberspammer.com domain), any host in the entire
+top level domain TLD, 192.168.212.* network, and the IPv6 address
+2002:c0a8:51d2::23f4.  It would allow relay for the IPv6 network
+2002:c0a8:02c7::/48.
 
 The value part of the map can contain:
 
@@ -2505,11 +2520,15 @@
 	FEATURE(`delay_checks', `hater')
 		 enables spamhater test
 
-If such an argument is given, the recipient will be looked up in the access
-map (using the tag Spam:).  If the argument is `friend', then the other
-rulesets will be skipped if the recipient address is found and has RHS
-friend.  If the argument is `hater', then the other rulesets will be
-applied if the recipient address is found and has RHS hater.
+If such an argument is given, the recipient will be looked up in the
+access map (using the tag Spam:).  If the argument is `friend', then
+the default behavior is to apply the other rulesets and make a SPAM
+friend the exception.  The rulesets check_mail and check_relay will be
+skipped only if the recipient address is found and has RHS FRIEND.  If
+the argument is `hater', then the default behavior is to skip the rulesets
+check_mail and check_relay and make a SPAM hater the exception.  The
+other two rulesets will be applied only if the recipient address is
+found and has RHS HATER.
 
 This allows for simple exceptions from the tests, e.g., by activating
 the friend option and having
@@ -3022,8 +3041,8 @@
 	LOCAL_NET_CONFIG
 	R$* < @ $* .$m. > $*	$#smtp $@ $2.$m. $: $1 < @ $2.$m. > $3
 
-This will cause all names that end in your domain name ($m) via
-SMTP; anything else will be sent via uucp-new (smart UUCP) to uunet.
+This will cause all names that end in your domain name ($m) to be sent
+via SMTP; anything else will be sent via uucp-new (smart UUCP) to uunet.
 If you have FEATURE(`nocanonify'), you may need to omit the dots after
 the $m.  If you are running a local DNS inside your domain which is
 not otherwise connected to the outside world, you probably want to
@@ -3998,7 +4017,9 @@
 absolutely sure you need them.  Options you may want to change
 include:
 
-- confTIME_ZONE on OS that don't use the default, e.g., Irix.
+- confTRUSTED_USERS, FEATURE(`use_ct_file'), and confCT_FILE for
+  avoiding X-Authorization warnings.
+- confTIME_ZONE to change it from the default `USE_TZ'.
 - confDELIVERY_MODE is set to interactive in msp.m4 instead
   of the default background mode.
 
@@ -4237,4 +4258,4 @@
    8	DNS based blacklists
    9	special local rulesets (1 and 2)
 
-$Revision: 8.600 $, Last updated $Date: 2002/01/10 17:43:41 $
+$Revision: 8.612 $, Last updated $Date: 2002/04/03 17:12:52 $

==== //depot/projects/ia64/contrib/sendmail/cf/cf/README#2 (text+ko) ====

@@ -5,8 +5,8 @@
 Please see ../README about the sendmail configuration files themselves.
 
 By default you need two .mc files: sendmail.mc and submit.mc.  The
-latter is a copy of msp.mc in which OSTYPE() has been filled in
-according to the host OS.  For the former see ../README.
+latter is an OS independent configuration file for the mail submission
+program (MSP).  See ../README for details about both files.
 
 Installation of these two files can be done via:
 
@@ -31,4 +31,4 @@
 For more details see Makefile.
 
 
-$Revision: 1.1 $, Last updated $Date: 2001/04/26 15:43:20 $
+$Revision: 1.2 $, Last updated $Date: 2002/02/22 00:33:54 $

==== //depot/projects/ia64/contrib/sendmail/cf/cf/submit.cf#2 (text+ko) ====

@@ -26,13 +26,13 @@
 
 #####  $Id: cfhead.m4,v 8.107 2001/07/22 03:25:37 ca Exp $  #####
 #####  $Id: cf.m4,v 8.32 1999/02/07 07:26:14 gshapiro Exp $  #####
-#####  $Id: submit.mc,v 8.5 2001/09/08 01:20:53 gshapiro Exp $  #####
-#####  $Id: msp.m4,v 1.29 2001/12/13 23:56:38 gshapiro Exp $  #####
+#####  $Id: submit.mc,v 8.6 2002/03/26 03:30:58 ca Exp $  #####
+#####  $Id: msp.m4,v 1.32 2002/03/26 22:02:03 ca Exp $  #####
 
 #####  $Id: no_default_msa.m4,v 8.2 2001/02/14 05:03:22 gshapiro Exp $  #####
 
 
-#####  $Id: proto.m4,v 8.628 2001/12/28 19:02:40 ca Exp $  #####
+#####  $Id: proto.m4,v 8.639 2002/04/02 23:42:42 gshapiro Exp $  #####
 
 # level 10 config file format
 V10/Berkeley
@@ -106,11 +106,11 @@
 DnMAILER-DAEMON
 
 
-D{MTAHost}localhost
+D{MTAHost}[localhost]
 
 
 # Configuration version number
-DZ8.12.2/Submit
+DZ8.12.3/Submit
 
 
 ###############
@@ -127,7 +127,7 @@
 O AliasWait=10
 
 # location of alias file
-O AliasFile
+#O AliasFile=/etc/mail/aliases
 
 # minimum number of free blocks on filesystem
 O MinFreeBlocks=100
@@ -259,6 +259,8 @@
 # key for shared memory; 0 to turn off
 #O SharedMemoryKey=0
 
+
+
 # timeouts (many of these)
 #O Timeout.initial=5m
 #O Timeout.connect=5m
@@ -312,7 +314,7 @@
 #  if undefined, use system default
 #  if defined but null, use TZ envariable passed in
 #  if defined and non-null, use that info
-#O TimeZoneSpec=
+O TimeZoneSpec=
 
 # default UID (can be username or userid:groupid)
 #O DefaultUser=mailnull
@@ -1351,19 +1353,19 @@
 R$+			$: $>MasqSMTP $1
 R$+			$: $>MasqHdr $1
 
-Msmtp,		P=[IPC], F=mDFMuXk05, S=EnvFromSMTP/HdrFromSMTP, R=EnvToSMTP, E=\r\n, L=990,
+Msmtp,		P=[IPC], F=mDFMuXk5, S=EnvFromSMTP/HdrFromSMTP, R=EnvToSMTP, E=\r\n, L=990,
 		T=DNS/RFC822/SMTP,
 		A=TCP $h
-Mesmtp,		P=[IPC], F=mDFMuXak05, S=EnvFromSMTP/HdrFromSMTP, R=EnvToSMTP, E=\r\n, L=990,
+Mesmtp,		P=[IPC], F=mDFMuXak5, S=EnvFromSMTP/HdrFromSMTP, R=EnvToSMTP, E=\r\n, L=990,
 		T=DNS/RFC822/SMTP,
 		A=TCP $h
-Msmtp8,		P=[IPC], F=mDFMuX8k05, S=EnvFromSMTP/HdrFromSMTP, R=EnvToSMTP, E=\r\n, L=990,
+Msmtp8,		P=[IPC], F=mDFMuX8k5, S=EnvFromSMTP/HdrFromSMTP, R=EnvToSMTP, E=\r\n, L=990,
 		T=DNS/RFC822/SMTP,
 		A=TCP $h
-Mdsmtp,		P=[IPC], F=mDFMuXa%k05, S=EnvFromSMTP/HdrFromSMTP, R=EnvToSMTP, E=\r\n, L=990,
+Mdsmtp,		P=[IPC], F=mDFMuXa%k5, S=EnvFromSMTP/HdrFromSMTP, R=EnvToSMTP, E=\r\n, L=990,
 		T=DNS/RFC822/SMTP,
 		A=TCP $h
-Mrelay,		P=[IPC], F=mDFMuXa8k0, S=EnvFromSMTP/HdrFromSMTP, R=MasqSMTP, E=\r\n, L=2040,
+Mrelay,		P=[IPC], F=mDFMuXa8k, S=EnvFromSMTP/HdrFromSMTP, R=MasqSMTP, E=\r\n, L=2040,
 		T=DNS/RFC822/SMTP,
 		A=TCP $h
 

==== //depot/projects/ia64/contrib/sendmail/cf/cf/submit.mc#2 (text+ko) ====

@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2001, 2002 Sendmail, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -15,8 +15,9 @@
 #
 
 divert(0)dnl
-VERSIONID(`$Id: submit.mc,v 8.5 2001/09/08 01:20:53 gshapiro Exp $')
+VERSIONID(`$Id: submit.mc,v 8.6 2002/03/26 03:30:58 ca Exp $')
 define(`confCF_VERSION', `Submit')dnl
 define(`__OSTYPE__',`')dnl dirty hack to keep proto.m4 from complaining
 define(`_USE_DECNET_SYNTAX_', `1')dnl support DECnet
+define(`confTIME_ZONE', `USE_TZ')dnl
 FEATURE(`msp')dnl

==== //depot/projects/ia64/contrib/sendmail/cf/feature/access_db.m4#3 (text+ko) ====

@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2002 Sendmail, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
 #
 
 divert(0)
-VERSIONID(`$Id: access_db.m4,v 8.23 2001/03/16 00:51:25 gshapiro Exp $')
+VERSIONID(`$Id: access_db.m4,v 8.24 2002/03/06 21:50:25 ca Exp $')
 divert(-1)
 
 define(`_ACCESS_TABLE_', `')
@@ -21,14 +21,18 @@
 ifelse(lower(_ARG3_),`lookupdotdomain',`define(`_LOOKUPDOTDOMAIN_', `1')')
 define(`_ATMPF_', `<TMPF>')dnl
 dnl check whether arg contains -T`'_ATMPF_
+dnl unless it is a sequence map
 ifelse(defn(`_ARG_'), `', `',
-	defn(`_ARG_'), `LDAP', `',
-	`ifelse(index(_ARG_, _ATMPF_), `-1',
-	`errprint(`*** WARNING: missing -T'_ATMPF_` in argument of FEATURE(`access_db',' defn(`_ARG_')`)
+  defn(`_ARG_'), `LDAP', `',
+  `ifelse(index(_ARG_, `sequence '), `0', `',
+    `ifelse(index(_ARG_, _ATMPF_), `-1',
+      `errprint(`*** WARNING: missing -T'_ATMPF_` in argument of FEATURE(`access_db',' defn(`_ARG_')`)
 ')
-	define(`_ABP_', index(_ARG_, ` '))
-	define(`_NARG_', `substr(_ARG_, 0, _ABP_) -T'_ATMPF_` substr(_ARG_, _ABP_)')
-')')
+      define(`_ABP_', index(_ARG_, ` '))
+      define(`_NARG_', `substr(_ARG_, 0, _ABP_) -T'_ATMPF_` substr(_ARG_, _ABP_)')
+      ')
+    ')
+  ')
 
 LOCAL_CONFIG
 # Access list database (for spam stomping)

==== //depot/projects/ia64/contrib/sendmail/cf/feature/compat_check.m4#2 (text+ko) ====

@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2000-2002 Sendmail, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -9,7 +9,7 @@
 #
 #
 divert(0)
-VERSIONID(`$Id: compat_check.m4,v 1.3 2001/11/21 18:40:06 ca Exp $')
+VERSIONID(`$Id: compat_check.m4,v 1.4 2002/02/26 22:15:31 gshapiro Exp $')
 divert(-1)
 ifdef(`_ACCESS_TABLE_', `',
 `errprint(`FEATURE(`compat_check') requires FEATURE(`access_db')
@@ -25,7 +25,7 @@
 R$* $| $*		$@ ok
 # act on the result,
 # it must be one of the following... anything else will be allowed..
-dnl for consistency with the other two even though discard does not take an
+dnl for consistency with the other two even though discard does not take a
 dnl reply code
 R< DISCARD:$* >	$#discard $: $1 " - discarded by check_compat"
 R< DISCARD $* >	$#discard $: $1 " - discarded by check_compat"

==== //depot/projects/ia64/contrib/sendmail/cf/feature/ldap_routing.m4#3 (text+ko) ====

@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1999-2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1999-2002 Sendmail, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -10,7 +10,7 @@
 #
 
 divert(0)
-VERSIONID(`$Id: ldap_routing.m4,v 8.8 2001/06/27 21:46:31 gshapiro Exp $')
+VERSIONID(`$Id: ldap_routing.m4,v 8.10 2002/03/27 22:17:43 ca Exp $')
 divert(-1)
 
 # Check first two arguments.  If they aren't set, may need to warn in proto.m4
@@ -31,9 +31,9 @@
 LOCAL_CONFIG
 # LDAP routing maps
 Kldapmh ifelse(len(X`'_ARG1_), `1',
-	       `ldap -1 -v mailHost -k (&(objectClass=inetLocalMailRecipient)(mailLocalAddress=%0))',
+	       `ldap -1 -T<TMPF> -v mailHost -k (&(objectClass=inetLocalMailRecipient)(mailLocalAddress=%0))',
 	       `_ARG1_')
 
 Kldapmra ifelse(len(X`'_ARG2_), `1',
-		`ldap -1 -v mailRoutingAddress -k (&(objectClass=inetLocalMailRecipient)(mailLocalAddress=%0))',
+		`ldap -1 -T<TMPF> -v mailRoutingAddress -k (&(objectClass=inetLocalMailRecipient)(mailLocalAddress=%0))',
 		`_ARG2_')

==== //depot/projects/ia64/contrib/sendmail/cf/feature/msp.m4#2 (text+ko) ====

@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2000-2002 Sendmail, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -10,9 +10,9 @@
 #
 
 divert(0)dnl
-VERSIONID(`$Id: msp.m4,v 1.29 2001/12/13 23:56:38 gshapiro Exp $')
+VERSIONID(`$Id: msp.m4,v 1.32 2002/03/26 22:02:03 ca Exp $')
 divert(-1)
-define(`ALIAS_FILE', `')
+undefine(`ALIAS_FILE')
 define(`confDELIVERY_MODE', `i')
 define(`confUSE_MSP', `True')
 define(`confFORWARD_PATH', `')
@@ -29,10 +29,10 @@
 ifdef(`MSP_QUEUE_DIR',
 `define(`QUEUE_DIR', `MSP_QUEUE_DIR')',
 `define(`QUEUE_DIR', `/var/spool/clientmqueue')')
-define(`_MTA_HOST_', ifelse(defn(`_ARG_'), `', `localhost', `_ARG_'))
+define(`_MTA_HOST_', ifelse(defn(`_ARG_'), `', `[localhost]', `_ARG_'))
 define(`_MSP_FQHN_',`dnl used to qualify addresses
 ifdef(`MASQUERADE_NAME', ifdef(`_MASQUERADE_ENVELOPE_', `$M', `$j'), `$j')')
-define(`RELAY_MAILER_ARGS', `TCP $h'ifelse(_ARG2_, `MSA', ` 587'))
+ifelse(_ARG2_, `MSA', `define(`RELAY_MAILER_ARGS', `TCP $h 587')')
 dnl ---------------------------------------------
 ifdef(`confPID_FILE', `dnl',
 `define(`confPID_FILE', QUEUE_DIR`/sm-client.pid')')
@@ -55,11 +55,11 @@
 define(`LOCAL_SHELL_PATH', `[IPC]')dnl
 define(`LOCAL_SHELL_FLAGS', `lmDFMuXk5')dnl
 define(`LOCAL_SHELL_ARGS', `TCP $h')dnl
-MODIFY_MAILER_FLAGS(`SMTP', `+k05')dnl
-MODIFY_MAILER_FLAGS(`ESMTP', `+k05')dnl
-MODIFY_MAILER_FLAGS(`DSMTP', `+k05')dnl
-MODIFY_MAILER_FLAGS(`SMTP8', `+k05')dnl
-MODIFY_MAILER_FLAGS(`RELAY', `+k0')dnl
+MODIFY_MAILER_FLAGS(`SMTP', `+k5')dnl
+MODIFY_MAILER_FLAGS(`ESMTP', `+k5')dnl
+MODIFY_MAILER_FLAGS(`DSMTP', `+k5')dnl
+MODIFY_MAILER_FLAGS(`SMTP8', `+k5')dnl
+MODIFY_MAILER_FLAGS(`RELAY', `+k')dnl
 MAILER(`local')dnl
 MAILER(`smtp')dnl
 

==== //depot/projects/ia64/contrib/sendmail/cf/m4/proto.m4#3 (text+ko) ====

@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2002 Sendmail, Inc. and its suppliers.
 #	All rights reserved.
 # Copyright (c) 1983, 1995 Eric P. Allman.  All rights reserved.
 # Copyright (c) 1988, 1993
@@ -13,7 +13,7 @@
 #
 divert(0)
 
-VERSIONID(`$Id: proto.m4,v 8.628 2001/12/28 19:02:40 ca Exp $')
+VERSIONID(`$Id: proto.m4,v 8.639 2002/04/02 23:42:42 gshapiro Exp $')
 
 # level CF_LEVEL config file format
 V`'CF_LEVEL/ifdef(`VENDOR_NAME', `VENDOR_NAME', `Berkeley')
@@ -337,7 +337,8 @@
 
 # SMTP daemon options
 ifelse(defn(`confDAEMON_OPTIONS'), `', `dnl',
-`errprint(WARNING: `confDAEMON_OPTIONS' is no longer valid.  See cf/README for more information.
+`errprint(WARNING: `confDAEMON_OPTIONS' is no longer valid.
+	Use `DAEMON_OPTIONS()'; see cf/README.
 )'dnl
 `DAEMON_OPTIONS(`confDAEMON_OPTIONS')')
 ifelse(defn(`_DPO_'), `',
@@ -395,6 +396,10 @@
 # key for shared memory; 0 to turn off
 _OPTION(SharedMemoryKey, `confSHARED_MEMORY_KEY', `0')
 
+ifdef(`confSHARED_MEMORY_KEY_FILE', `dnl
+# file to store key for shared memory (if SharedMemoryKey = -1)
+O SharedMemoryKeyFile=confSHARED_MEMORY_KEY_FILE')
+
 # timeouts (many of these)
 _OPTION(Timeout.initial, `confTO_INITIAL', `5m')
 _OPTION(Timeout.connect, `confTO_CONNECT', `5m')
@@ -1416,6 +1421,10 @@
 # do the LDAP lookups
 R<$+><$+><$*>	$: <$(ldapmra $2 $: $)> <$(ldapmh $2 $: $)> <$1> <$2> <$3>
 
+# look for temporary failures (return original address, MTA will queue up)
+R<$* <TMPF>> <$*> <$+> <$+> <$*>	$@ $2
+R<$*> <$* <TMPF>> <$+> <$+> <$*>	$@ $2
+
 # if mailRoutingAddress and local or non-existant mailHost,
 # return the new mailRoutingAddress
 ifelse(_LDAP_ROUTE_DETAIL_, `_PRESERVE_', `dnl
@@ -2104,7 +2113,7 @@
 # check whether local FROM is ok
 R<?> $+ < @ $=w >	$@ RELAY		FROM local', `dnl')
 ifdef(`_RELAY_DB_FROM_', `dnl
-R<?> $+ < @ $+ >	$: <@> $>SearchList <! From> $| <F:$1@$2> ifdef(`_RELAY_DB_FROM_DOMAIN_', `<D:$2>') <>
+R<?> $+ < @ $+ >	$: <@> $>SearchList <! From> $| <F:$1@$2> ifdef(`_RELAY_DB_FROM_DOMAIN_', ifdef(`_RELAY_HOSTS_ONLY_', `<E:$2>', `<D:$2>')) <>
 R<@> <RELAY>		$@ RELAY		RELAY FROM sender ok
 ifdef(`_ATMPF_', `R<@> <_ATMPF_>		$#TEMP $@ 4.3.0 $: "451 Temporary system failure. Please try again later."', `dnl')
 ', `dnl
@@ -2201,9 +2210,10 @@
 ifdef(`_FFR_MAIL_MACRO',
 `R$*			$: $1 $| $>checkmail $&{mail_from}',
 `R$*			$: $1 $| $>checkmail <$&f>')
+dnl recipient (canonical format) $| result of checkmail
 R$* $| $#$*		$#$2
 dnl run further checks: check_relay
-R$*			$: $1 $| $>checkrelay $&{client_name} $| $&{client_addr}
+R$* $| $*		$: $1 $| $>checkrelay $&{client_name} $| $&{client_addr}
 R$* $| $#$*		$#$2
 R$* $| $*		$: $1
 ', `dnl')

==== //depot/projects/ia64/contrib/sendmail/cf/m4/version.m4#3 (text+ko) ====

@@ -11,8 +11,8 @@
 # the sendmail distribution.
 #
 #
-VERSIONID(`$Id: version.m4,v 8.81 2002/01/13 18:23:32 ca Exp $')
+VERSIONID(`$Id: version.m4,v 8.89 2002/04/04 22:20:08 ca Exp $')
 #
 divert(0)
 # Configuration version number
-DZ8.12.2`'ifdef(`confCF_VERSION', `/confCF_VERSION')
+DZ8.12.3`'ifdef(`confCF_VERSION', `/confCF_VERSION')

==== //depot/projects/ia64/contrib/sendmail/cf/ostype/darwin.m4#3 (text+ko) ====

@@ -1,6 +1,6 @@
 divert(-1)
 #
-# Copyright (c) 2000 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2000, 2002 Sendmail, Inc. and its suppliers.
 #	All rights reserved.
 #
 # By using this file, you agree to the terms and conditions set
@@ -8,10 +8,11 @@
 # the sendmail distribution.
 #
 #
-#
 
 divert(0)
-VERSIONID(`$Id: darwin.m4,v 8.1 2000/06/15 06:36:30 gshapiro Exp $')
+VERSIONID(`$Id: darwin.m4,v 8.3 2002/03/05 01:55:40 ca Exp $')
 ifdef(`STATUS_FILE',, `define(`STATUS_FILE', `/var/log/sendmail.st')')dnl
+dnl turn on S flag for local mailer
+MODIFY_MAILER_FLAGS(`LOCAL', `+S')dnl
 ifdef(`LOCAL_MAILER_PATH',, `define(`LOCAL_MAILER_PATH', /usr/libexec/mail.local)')dnl
 ifdef(`UUCP_MAILER_ARGS',, `define(`UUCP_MAILER_ARGS', `uux - -r -z -a$g $h!rmail ($u)')')dnl

==== //depot/projects/ia64/contrib/sendmail/contrib/buildvirtuser#3 (text+ko) ====

@@ -1,6 +1,6 @@
 #!/usr/bin/perl -w
 
-# Copyright (c) 1999-2001 Gregory Neil Shapiro.  All Rights Reserved.
+# Copyright (c) 1999-2002 Gregory Neil Shapiro.  All Rights Reserved.
 # 
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -27,7 +27,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 
-# $Id: buildvirtuser,v 1.3 2001/02/12 02:58:20 gshapiro Exp $
+# $Id: buildvirtuser,v 1.5 2002/02/08 08:10:59 gshapiro Exp $
 
 =head1 NAME
 
@@ -35,7 +35,7 @@
 
 =head1 SYNOPSIS
 
-    buildvirtuser
+    buildvirtuser [-f]
 
 =head1 DESCRIPTION
 
@@ -50,6 +50,9 @@
 Occurrences of $LHS in the right hand side are replaced by the address on

>>> TRUNCATED FOR MAIL (1000 lines) <<<

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200204101028.g3AASoJ32242>