PERFORCE change 38308 for review
Marcel Moolenaar
marcel at FreeBSD.org
Fri Sep 19 16:52:58 PDT 2003
http://perforce.freebsd.org/chv.cgi?CH=38308
Change 38308 by marcel at marcel_nfs on 2003/09/19 16:52:10
IFC @38307
Affected files ...
.. //depot/projects/ia64/contrib/sendmail/FREEBSD-upgrade#14 integrate
.. //depot/projects/ia64/contrib/sendmail/LICENSE#5 integrate
.. //depot/projects/ia64/contrib/sendmail/RELEASE_NOTES#11 integrate
.. //depot/projects/ia64/contrib/sendmail/cf/README#11 integrate
.. //depot/projects/ia64/contrib/sendmail/cf/cf/submit.cf#10 integrate
.. //depot/projects/ia64/contrib/sendmail/cf/cf/submit.mc#6 integrate
.. //depot/projects/ia64/contrib/sendmail/cf/m4/cfhead.m4#8 integrate
.. //depot/projects/ia64/contrib/sendmail/cf/m4/proto.m4#11 integrate
.. //depot/projects/ia64/contrib/sendmail/cf/m4/version.m4#11 integrate
.. //depot/projects/ia64/contrib/sendmail/contrib/domainmap.m4#3 integrate
.. //depot/projects/ia64/contrib/sendmail/contrib/doublebounce.pl#3 integrate
.. //depot/projects/ia64/contrib/sendmail/contrib/expn.pl#3 integrate
.. //depot/projects/ia64/contrib/sendmail/doc/op/op.me#11 integrate
.. //depot/projects/ia64/contrib/sendmail/include/sm/conf.h#9 integrate
.. //depot/projects/ia64/contrib/sendmail/include/sm/errstring.h#4 integrate
.. //depot/projects/ia64/contrib/sendmail/include/sm/io.h#5 integrate
.. //depot/projects/ia64/contrib/sendmail/include/sm/os/sm_os_aix.h#4 integrate
.. //depot/projects/ia64/contrib/sendmail/include/sm/shm.h#4 integrate
.. //depot/projects/ia64/contrib/sendmail/libmilter/README#6 integrate
.. //depot/projects/ia64/contrib/sendmail/libmilter/docs/sample.html#4 integrate
.. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_chgheader.html#4 integrate
.. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_register.html#3 integrate
.. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_setconn.html#3 integrate
.. //depot/projects/ia64/contrib/sendmail/libmilter/docs/smfi_setreply.html#5 integrate
.. //depot/projects/ia64/contrib/sendmail/libmilter/engine.c#8 integrate
.. //depot/projects/ia64/contrib/sendmail/libmilter/libmilter.h#7 integrate
.. //depot/projects/ia64/contrib/sendmail/libmilter/listener.c#10 integrate
.. //depot/projects/ia64/contrib/sendmail/libmilter/signal.c#7 integrate
.. //depot/projects/ia64/contrib/sendmail/libsm/clock.c#8 integrate
.. //depot/projects/ia64/contrib/sendmail/libsm/errstring.c#4 integrate
.. //depot/projects/ia64/contrib/sendmail/libsm/flags.c#4 integrate
.. //depot/projects/ia64/contrib/sendmail/libsm/ldap.c#6 integrate
.. //depot/projects/ia64/contrib/sendmail/libsm/shm.c#4 integrate
.. //depot/projects/ia64/contrib/sendmail/libsm/smstdio.c#5 integrate
.. //depot/projects/ia64/contrib/sendmail/libsm/stdio.c#7 integrate
.. //depot/projects/ia64/contrib/sendmail/libsm/vasprintf.c#4 integrate
.. //depot/projects/ia64/contrib/sendmail/libsmdb/smdb2.c#7 integrate
.. //depot/projects/ia64/contrib/sendmail/mail.local/mail.local.c#10 integrate
.. //depot/projects/ia64/contrib/sendmail/smrsh/README#5 integrate
.. //depot/projects/ia64/contrib/sendmail/smrsh/smrsh.8#6 integrate
.. //depot/projects/ia64/contrib/sendmail/src/README#10 integrate
.. //depot/projects/ia64/contrib/sendmail/src/TRACEFLAGS#7 integrate
.. //depot/projects/ia64/contrib/sendmail/src/alias.c#5 integrate
.. //depot/projects/ia64/contrib/sendmail/src/bf.c#6 integrate
.. //depot/projects/ia64/contrib/sendmail/src/collect.c#9 integrate
.. //depot/projects/ia64/contrib/sendmail/src/conf.c#13 integrate
.. //depot/projects/ia64/contrib/sendmail/src/control.c#7 integrate
.. //depot/projects/ia64/contrib/sendmail/src/daemon.c#9 integrate
.. //depot/projects/ia64/contrib/sendmail/src/deliver.c#11 integrate
.. //depot/projects/ia64/contrib/sendmail/src/domain.c#8 integrate
.. //depot/projects/ia64/contrib/sendmail/src/headers.c#9 integrate
.. //depot/projects/ia64/contrib/sendmail/src/main.c#11 integrate
.. //depot/projects/ia64/contrib/sendmail/src/map.c#9 integrate
.. //depot/projects/ia64/contrib/sendmail/src/mci.c#10 integrate
.. //depot/projects/ia64/contrib/sendmail/src/milter.c#11 integrate
.. //depot/projects/ia64/contrib/sendmail/src/mime.c#6 integrate
.. //depot/projects/ia64/contrib/sendmail/src/parseaddr.c#12 integrate
.. //depot/projects/ia64/contrib/sendmail/src/queue.c#11 integrate
.. //depot/projects/ia64/contrib/sendmail/src/readcf.c#10 integrate
.. //depot/projects/ia64/contrib/sendmail/src/recipient.c#6 integrate
.. //depot/projects/ia64/contrib/sendmail/src/sendmail.8#6 integrate
.. //depot/projects/ia64/contrib/sendmail/src/sendmail.h#11 integrate
.. //depot/projects/ia64/contrib/sendmail/src/sfsasl.c#9 integrate
.. //depot/projects/ia64/contrib/sendmail/src/srvrsmtp.c#11 integrate
.. //depot/projects/ia64/contrib/sendmail/src/stab.c#5 integrate
.. //depot/projects/ia64/contrib/sendmail/src/udb.c#6 integrate
.. //depot/projects/ia64/contrib/sendmail/src/usersmtp.c#9 integrate
.. //depot/projects/ia64/contrib/sendmail/src/util.c#8 integrate
.. //depot/projects/ia64/contrib/sendmail/src/version.c#11 integrate
.. //depot/projects/ia64/lib/libpthread/arch/alpha/include/pthread_md.h#2 integrate
.. //depot/projects/ia64/lib/libpthread/arch/amd64/include/pthread_md.h#4 integrate
.. //depot/projects/ia64/lib/libpthread/arch/i386/include/pthread_md.h#6 integrate
.. //depot/projects/ia64/lib/libpthread/arch/ia64/ia64/context.S#4 integrate
.. //depot/projects/ia64/lib/libpthread/arch/ia64/include/pthread_md.h#7 integrate
.. //depot/projects/ia64/lib/libpthread/thread/thr_kern.c#36 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#126 integrate
.. //depot/projects/ia64/sys/fs/nwfs/nwfs_io.c#9 integrate
.. //depot/projects/ia64/sys/fs/smbfs/smbfs_io.c#12 integrate
.. //depot/projects/ia64/sys/nfsclient/nfs_bio.c#16 integrate
.. //depot/projects/ia64/sys/vm/uma_core.c#53 integrate
.. //depot/projects/ia64/sys/vm/uma_int.h#18 integrate
Differences ...
==== //depot/projects/ia64/contrib/sendmail/FREEBSD-upgrade#14 (text+ko) ====
@@ -1,6 +1,6 @@
-$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.21 2003/03/29 19:21:28 gshapiro Exp $
+$FreeBSD: src/contrib/sendmail/FREEBSD-upgrade,v 1.22 2003/09/19 23:20:46 gshapiro Exp $
-sendmail 8.12.9
+sendmail 8.12.10
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.9' \
- src/contrib/sendmail SENDMAIL v8_12_9
+ cvs import -m 'Import sendmail 8.12.10' \
+ src/contrib/sendmail SENDMAIL v8_12_10
To make local changes to sendmail, simply patch and commit to the main
@@ -92,4 +92,4 @@
usr.sbin/mailwrapper/Makefile
gshapiro at FreeBSD.org
-29-March-2003
+19-September-2003
==== //depot/projects/ia64/contrib/sendmail/LICENSE#5 (text+ko) ====
@@ -2,7 +2,7 @@
The following license terms and conditions apply, unless a different
license is obtained from Sendmail, Inc., 6425 Christie Ave, Fourth Floor,
-Emeryville, CA 94608, or by electronic mail at license at sendmail.com.
+Emeryville, CA 94608, USA, or by electronic mail at license at sendmail.com.
License Terms:
@@ -33,7 +33,7 @@
forth as paragraph 6 below, in the documentation and/or other materials
provided with the distribution. For the purposes of binary distribution
the "Copyright Notice" refers to the following language:
- "Copyright (c) 1998-2002 Sendmail, Inc. All rights reserved."
+ "Copyright (c) 1998-2003 Sendmail, Inc. All rights reserved."
4. Neither the name of Sendmail, Inc. nor the University of California nor
the names of their contributors may be used to endorse or promote
@@ -76,4 +76,4 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-$Revision: 8.11 $, Last updated $Date: 2002/04/24 22:26:56 $
+$Revision: 8.11.2.1 $, Last updated $Date: 2003/04/19 14:30:36 $
==== //depot/projects/ia64/contrib/sendmail/RELEASE_NOTES#11 (text+ko) ====
@@ -1,16 +1,83 @@
SENDMAIL RELEASE NOTES
- $Id: RELEASE_NOTES,v 8.1340.2.132 2003/03/29 14:02:26 ca Exp $
+ $Id: RELEASE_NOTES,v 8.1340.2.165 2003/09/16 20:50:42 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.10/8.12.10 2003/09/24
+ SECURITY: Fix a buffer overflow in address parsing. Problem
+ detected by Michal Zalewski, patch from Todd C. Miller
+ of Courtesan Consulting.
+ Fix a potential buffer overflow in ruleset parsing. This problem
+ is not exploitable in the default sendmail configuration;
+ only if non-standard rulesets recipient (2), final (4), or
+ mailer-specific envelope recipients rulesets are used then
+ a problem may occur. Problem noted by Timo Sirainen.
+ Accept 0 (and 0/0) as valid input for set MaxMimeHeaderLength.
+ Problem noted by Thomas Schulz.
+ Add several checks to avoid (theoretical) buffer over/underflows.
+ Properly count message size when performing 7->8 or 8->7 bit MIME
+ conversions. Problem noted by Werner Wiethege.
+ Properly compute message priority based on size of entire message,
+ not just header. Problem noted by Axel Holscher.
+ Reset SevenBitInput to its configured value between SMTP
+ transactions for broken clients which do not properly
+ announce 8 bit data. Problem noted by Stefan Roehrich.
+ Set {addr_type} during queue runs when processing recipients.
+ Based on patch from Arne Jansen.
+ Better error handling in case of (very unlikely) queue-id conflicts.
+ Perform better error recovery for address parsing, e.g., when
+ encountering a comment that is too long. Problem noted by
+ Tanel Kokk, Union Bank of Estonia.
+ Add ':' to the allowed character list for bogus HELO/EHLO
+ checking. It is used for IPv6 domain literals. Patch from
+ Iwaizako Takahiro of FreeBit Co., Ltd.
+ Reset SASL connection context after a failed authentication attempt.
+ Based on patch from Rob Siemborski of CMU.
+ Check Berkeley DB compile time version against run time version
+ to make sure they match.
+ Do not attempt AAAA (IPv6) DNS lookups if IPv6 is not enabled
+ in the kernel.
+ When a milter adds recipients and one of them causes an error,
+ do not ignore the other recipients. Problem noted by
+ Bart Duchesne.
+ CONFIG: Use specified SMTP error code in mailertable entries which
+ lack a DSN, i.e., "error:### Text". Problem noted by
+ Craig Hunt.
+ CONFIG: Call Local_trust_auth with the correct argument. Patch
+ from Jerome Borsboom.
+ CONTRIB: Better handling of temporary filenames for doublebounce.pl
+ and expn.pl to avoid file overwrites, etc. Patches from
+ Richard A. Nelson of Debian and Paul Szabo.
+ MAIL.LOCAL: Fix obscure race condition that could lead to an
+ improper mailbox truncation if close() fails after the
+ mailbox is fsync()'ed and a new message is delivered
+ after the close() and before the truncate().
+ MAIL.LOCAL: If mail delivery fails, do not leave behind a
+ stale lockfile (which is ignored after the lock timeout).
+ Patch from Oleg Bulyzhin of Cronyx Plus LLC.
+ Portability:
+ Port for AIX 5.2. Thanks to Steve Hubert of University
+ of Washington for providing access to a computer
+ with AIX 5.2.
+ setreuid(2) works on OpenBSD 3.3. Patch from
+ Todd C. Miller of Courtesan Consulting.
+ Allow for custom definition of SMRSH_CMDDIR and SMRSH_PATH
+ on all operating systems. Patch from Robert Harker
+ of Harker Systems.
+ Use strerror(3) on Linux. If this causes a problem on
+ your Linux distribution, compile with
+ -DHASSTRERROR=0 and tell sendmail.org about it.
+ Added Files:
+ devtools/OS/AIX.5.2
+
8.12.9/8.12.9 2003/03/29
SECURITY: Fix a buffer overflow in address parsing due to
a char to int conversion problem which is potentially
remotely exploitable. Problem found by Michal Zalewski.
- Note: an MTA that is not patched might be vulnerable to
+ Note: an MTA that is not patched might be vulnerable to
data that it receives from untrusted sources, which
includes DNS.
To provide partial protection to internal, unpatched sendmail MTAs,
@@ -31,7 +98,7 @@
College London.
Properly initialize data structure for dns maps to avoid various
errors, e.g., looping processes. Problem noted by
- Maurice Makaay.
+ Maurice Makaay of InterNLnet B.V.
CONFIG: Prevent multiple application of rule to add smart host.
Patch from Andrzej Filip.
CONFIG: Fix queue group declaration in MAILER(`usenet').
@@ -1457,6 +1524,67 @@
cf/cf/generic-solaris2.cf => cf/cf/generic-solaris.cf
cf/ostype/aux.m4 => cf/ostype/a-ux.m4
+8.11.7/8.11.7 2003/03/29
+ SECURITY: Fix a remote buffer overflow in header parsing by
+ dropping sender and recipient header comments if the
+ comments are too long. Problem noted by Mark Dowd
+ of ISS X-Force.
+ SECURITY: Fix a buffer overflow in address parsing due to
+ a char to int conversion problem which is potentially
+ remotely exploitable. Problem found by Michal Zalewski.
+ Note: an MTA that is not patched might be vulnerable to
+ data that it receives from untrusted sources, which
+ includes DNS.
+ To provide partial protection to internal, unpatched sendmail MTAs,
+ 8.11.7 changes by default (char)0xff to (char)0x7f in
+ headers etc. To turn off this conversion compile with
+ -DALLOW_255 or use the command line option -d82.101.
+ To provide partial protection for internal, unpatched MTAs that may be
+ performing 7->8 or 8->7 bit MIME conversions, the default
+ for MaxMimeHeaderLength has been changed to 2048/1024.
+ Note: this does have a performance impact, and it only
+ protects against frontal attacks from the outside.
+ To disable the checks and return to pre-8.11.7 defaults,
+ set MaxMimeHeaderLength to 0/0.
+ Properly clean up macros to avoid persistence of session data
+ across various connections. This could cause session
+ oriented restrictions, e.g., STARTTLS requirements,
+ to erroneously allow a connection. Problem noted
+ by Tim Maletic of Priority Health.
+ Ignore comments in NIS host records when trying to find the
+ canonical name for a host.
+ Fix a memory leak when closing Hesiod maps.
+ Set ${msg_size} macro when reading a message from the command line
+ or the queue.
+ Prevent a segmentation fault when clearing the event list by
+ turning off alarms before checking if event list is
+ empty. Problem noted by Allan E Johannesen of Worcester
+ Polytechnic Institute.
+ Fix a potential core dump problem if the environment variable
+ NAME is set. Problem noted by Beth A. Chaney of
+ Purdue University.
+ Prevent a race condition on child cleanup for delivery to files.
+ Problem noted by Fletcher Mattox of the University of
+ Texas.
+ CONFIG: Do not bounce mail if FEATURE(`ldap_routing')'s bounce
+ parameter is set and the LDAP lookup returns a temporary
+ error.
+ CONFIG: Fix a syntax error in the try_tls ruleset if
+ FEATURE(`access_db') is not enabled.
+ LIBSMDB: Fix a lock race condition that affects makemap, praliases,
+ and vacation.
+ LIBSMDB: Avoid a file creation race condition for Berkeley DB 1.X
+ and NDBM on systems with the O_EXLOCK open(2) flag.
+ MAKEMAP: Avoid going beyond the end of an input line if it does
+ not contain a value for a key. Based on patch from
+ Mark Bixby from Hewlett-Packard.
+ MAIL.LOCAL: Fix a truncation race condition if the close() on
+ the mailbox fails. Problem noted by Tomoko Fukuzawa of
+ Sun Microsystems.
+ SMRSH: SECURITY: Only allow regular files or symbolic links to be
+ used for a command. Problem noted by David Endler of
+ iDEFENSE, Inc.
+
8.11.6/8.11.6 2001/08/20
SECURITY: Fix a possible memory access violation when specifying
out-of-bounds debug parameters. Problem detected by
@@ -2686,10 +2814,9 @@
Log the DSN code for each recipient if one is available as a new
equate (dsn=).
Macro expand PostmasterCopy and DoubleBounceAddress options.
- New "ph" map for performing ph queries in rulesets. More
- information is available at
- http://www-dev.cso.uiuc.edu/sendmail/. Contributed by Mark
- Roth of the University of Illinois at Urbana-Champaign.
+ New "ph" map for performing ph queries in rulesets, see
+ sendmail/README for details. Contributed by Mark Roth
+ of the University of Illinois at Urbana-Champaign.
Detect temporary lookup failures in the host map if looking up a
bracketed IP address. Problem noted by Kari Hurtta of the
Finnish Meteorological Institute.
==== //depot/projects/ia64/contrib/sendmail/cf/README#11 (text+ko) ====
@@ -2765,15 +2765,14 @@
Relaying
--------
-
SMTP STARTTLS can allow relaying for remote SMTP clients which have
-successfully authenticated themselves. This is done in the ruleset
-RelayAuth. If the verification of the cert failed (${verify} != OK),
-relaying is subject to the usual rules. Otherwise the DN of the issuer is
-looked up in the access map using the tag CERTISSUER. If the resulting
-value is RELAY, relaying is allowed. If it is SUBJECT, the DN of the cert
-subject is looked up next in the access map using the tag CERTSUBJECT. If
-the value is RELAY, relaying is allowed.
+successfully authenticated themselves. If the verification of the cert
+failed (${verify} != OK), relaying is subject to the usual rules.
+Otherwise the DN of the issuer is looked up in the access map using the
+tag CERTISSUER. If the resulting value is RELAY, relaying is allowed.
+If it is SUBJECT, the DN of the cert subject is looked up next in the
+access map using the tag CERTSUBJECT. If the value is RELAY, relaying
+is allowed.
${cert_issuer} and ${cert_subject} can be optionally modified by regular
expressions defined in the m4 variables _CERT_REGEX_ISSUER_ and
@@ -3245,7 +3244,9 @@
The [square brackets] turn off MX records for this host only.
If you didn't do this, the mailertable would use the MX record
-again, which would give you an MX loop.
+again, which would give you an MX loop. Note that the use of
+wildcard MX records is almost always a bad idea. Please avoid
+using them if possible.
+--------------------------------+
@@ -4374,4 +4375,4 @@
8 DNS based blacklists
9 special local rulesets (1 and 2)
-$Revision: 8.623.2.23 $, Last updated $Date: 2003/03/28 17:28:26 $
+$Revision: 8.623.2.25 $, Last updated $Date: 2003/06/18 18:47:21 $
==== //depot/projects/ia64/contrib/sendmail/cf/cf/submit.cf#10 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1998-2002 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2003 Sendmail, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983, 1995 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -24,15 +24,15 @@
######################################################################
######################################################################
-##### $Id: cfhead.m4,v 8.108.2.2 2003/03/11 21:24:20 ca Exp $ #####
+##### $Id: cfhead.m4,v 8.108.2.3 2003/04/03 17:51:51 ca Exp $ #####
##### $Id: cf.m4,v 8.32 1999/02/07 07:26:14 gshapiro Exp $ #####
-##### $Id: submit.mc,v 8.6.2.4 2002/12/29 03:54:34 ca Exp $ #####
+##### $Id: submit.mc,v 8.6.2.7 2003/09/10 22:11:56 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.649.2.17 2003/03/28 17:20:53 ca Exp $ #####
+##### $Id: proto.m4,v 8.649.2.24 2003/08/04 21:14:26 ca Exp $ #####
# level 10 config file format
V10/Berkeley
@@ -110,7 +110,7 @@
# Configuration version number
-DZ8.12.9/Submit
+DZ8.12.10/Submit
###############
@@ -834,7 +834,8 @@
SMailerToTriple=95
R< > $* $@ $1 strip off null relay
R< error : $-.$-.$- : $+ > $* $#error $@ $1.$2.$3 $: $4
-R< error : $- $+ > $* $#error $@ $(dequote $1 $) $: $2
+R< error : $- : $+ > $* $#error $@ $(dequote $1 $) $: $2
+R< error : $+ > $* $#error $: $1
R< local : $* > $* $>CanonLocal < $1 > $2
R< $~[ : $+ @ $+ > $*<$*>$* $# $1 $@ $3 $: $2<@$3> use literal user
R< $~[ : $+ > $* $# $1 $@ $2 $: $3 try qualified mailer
@@ -1137,7 +1138,7 @@
R$@ $| $* $#error $@ 5.7.1 $: "550 not authenticated"
R$* $| $&{auth_authen} $@ identical
R$* $| <$&{auth_authen}> $@ identical
-R$* $| $* $: $1 $| $>"Local_trust_auth" $1
+R$* $| $* $: $1 $| $>"Local_trust_auth" $2
R$* $| $#$* $#$2
R$* $#error $@ 5.7.1 $: "550 " $&{auth_authen} " not allowed to act as " $&{auth_author}
==== //depot/projects/ia64/contrib/sendmail/cf/cf/submit.mc#6 (text+ko) ====
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 2001, 2002 Sendmail, Inc. and its suppliers.
+# Copyright (c) 2001-2003 Sendmail, Inc. and its suppliers.
# All rights reserved.
#
# By using this file, you agree to the terms and conditions set
@@ -15,7 +15,7 @@
#
divert(0)dnl
-VERSIONID(`$Id: submit.mc,v 8.6.2.4 2002/12/29 03:54:34 ca Exp $')
+VERSIONID(`$Id: submit.mc,v 8.6.2.7 2003/09/10 22:11:56 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
==== //depot/projects/ia64/contrib/sendmail/cf/m4/cfhead.m4#8 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1998-2002 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2003 Sendmail, Inc. and its suppliers.
# All rights reserved.
# Copyright (c) 1983, 1995 Eric P. Allman. All rights reserved.
# Copyright (c) 1988, 1993
@@ -9,7 +9,7 @@
# forth in the LICENSE file which can be found at the top level of
# the sendmail distribution.
#
-# $FreeBSD: src/contrib/sendmail/cf/m4/cfhead.m4,v 1.14 2003/03/29 19:18:07 gshapiro Exp $
+# $FreeBSD: src/contrib/sendmail/cf/m4/cfhead.m4,v 1.15 2003/09/19 23:14:57 gshapiro Exp $
#
######################################################################
@@ -307,4 +307,4 @@
divert(0)dnl
-VERSIONID(`$Id: cfhead.m4,v 8.108.2.2 2003/03/11 21:24:20 ca Exp $')
+VERSIONID(`$Id: cfhead.m4,v 8.108.2.3 2003/04/03 17:51:51 ca Exp $')
==== //depot/projects/ia64/contrib/sendmail/cf/m4/proto.m4#11 (text+ko) ====
@@ -1,6 +1,6 @@
divert(-1)
#
-# Copyright (c) 1998-2002 Sendmail, Inc. and its suppliers.
+# Copyright (c) 1998-2003 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.649.2.17 2003/03/28 17:20:53 ca Exp $')
+VERSIONID(`$Id: proto.m4,v 8.649.2.24 2003/08/04 21:14:26 ca Exp $')
# level CF_LEVEL config file format
V`'CF_LEVEL/ifdef(`VENDOR_NAME', `VENDOR_NAME', `Berkeley')
@@ -1283,6 +1283,7 @@
dnl input: in general: <[mailer:]host> lp<@domain>rest
dnl <> address -> address
dnl <error:d.s.n:text> -> error
+dnl <error:keyword:text> -> error
dnl <error:text> -> error
dnl <mailer:user at host> lp<@domain>rest -> mailer host user
dnl <mailer:host> address -> mailer host address
@@ -1293,7 +1294,8 @@
SMailerToTriple=95
R< > $* $@ $1 strip off null relay
R< error : $-.$-.$- : $+ > $* $#error $@ $1.$2.$3 $: $4
-R< error : $- $+ > $* $#error $@ $(dequote $1 $) $: $2
+R< error : $- : $+ > $* $#error $@ $(dequote $1 $) $: $2
+R< error : $+ > $* $#error $: $1
R< local : $* > $* $>CanonLocal < $1 > $2
dnl it is $~[ instead of $- to avoid matches on IPv6 addresses
R< $~[ : $+ @ $+ > $*<$*>$* $# $1 $@ $3 $: $2<@$3> use literal user
@@ -1909,8 +1911,10 @@
dnl prepend daemon_flags
R<@> $* $: $&{daemon_flags} $| <@> $1
dnl workspace: ${daemon_flags} $| <@> <address>
+dnl 'r'equire qual.rcpt: ok
+R$* r $* $| <@> < $+ @ $+ > $: < $3 @ $4 >
dnl do not allow these at all or only from local systems?
-R$* r $* $| <@> < $* @ $* > $: < ? $&{client_name} > < $3 @ $4 >
+R$* r $* $| <@> < $* > $: < ? $&{client_name} > < $3 >
R<?> < $* > $: <$1>
R<? $=w> < $* > $: <$1>
R<? $+> <$+> $#error $@ 5.5.4 $: "553 Fully qualified domain name required"
@@ -2195,22 +2199,24 @@
R$* <@ $* > $@ $1 <@ $2 >
R$+ $@ $1 <@ $j >
-SDelay_TLS_Client
+SDelay_TLS_Clt
# authenticated?
dnl code repeated here from Basic_check_mail
dnl only called from check_rcpt in delay mode if checkrcpt returns $#
R$* $: $1 $| $>"tls_client" $&{verify} $| MAIL
R$* $| $#$+ $#$2
dnl return result from checkrcpt
+R$* $| $* $# $1
R$* $# $1
-SDelay_TLS_Client2
+SDelay_TLS_Clt2
# authenticated?
dnl code repeated here from Basic_check_mail
dnl only called from check_rcpt in delay mode if stopping due to Friend/Hater
R$* $: $1 $| $>"tls_client" $&{verify} $| MAIL
R$* $| $#$+ $#$2
dnl return result from friend/hater check
+R$* $| $* $@ $1
R$* $@ $1
# call all necessary rulesets
@@ -2225,7 +2231,7 @@
R$+ $| $#error $* $#error $2
R$+ $| $#discard $* $#discard $2
dnl otherwise call tls_client; see above
-R$+ $| $#$* $@ $>"Delay_TLS_Client" $2
+R$+ $| $#$* $@ $>"Delay_TLS_Clt" $2
R$+ $| $* $: <?> $>FullAddr $>CanonAddr $1
ifdef(`_SPAM_FH_',
`dnl lookup user@ and user at address
@@ -2247,13 +2253,13 @@
ifdef(`_SPAM_HATER_',
`errprint(`*** ERROR: define either Hater or Friend -- not both.
')', `dnl')
-R<FRIEND> $+ $@ $>"Delay_TLS_Client2" SPAMFRIEND
+R<FRIEND> $+ $@ $>"Delay_TLS_Clt2" SPAMFRIEND
R<$*> $+ $: $2',
`dnl')
ifdef(`_SPAM_HATER_',
`# is the recipient no spam hater?
R<HATER> $+ $: $1 spam hater: continue checks
-R<$*> $+ $@ $>"Delay_TLS_Client2" NOSPAMHATER everyone else: stop
+R<$*> $+ $@ $>"Delay_TLS_Clt2" NOSPAMHATER everyone else: stop
dnl',`dnl')
dnl run further checks: check_mail
dnl should we "clean up" $&f?
@@ -2467,7 +2473,7 @@
R$* $| $&{auth_authen} $@ identical
R$* $| <$&{auth_authen}> $@ identical
dnl call user supplied code
-R$* $| $* $: $1 $| $>"Local_trust_auth" $1
+R$* $| $* $: $1 $| $>"Local_trust_auth" $2
R$* $| $#$* $#$2
dnl default: error
R$* $#error $@ 5.7.1 $: "550 " $&{auth_authen} " not allowed to act as " $&{auth_author}
==== //depot/projects/ia64/contrib/sendmail/cf/m4/version.m4#11 (text+ko) ====
@@ -11,8 +11,8 @@
# the sendmail distribution.
#
#
-VERSIONID(`$Id: version.m4,v 8.92.2.15 2003/03/19 21:19:52 ca Exp $')
+VERSIONID(`$Id: version.m4,v 8.92.2.22 2003/09/16 20:02:05 ca Exp $')
#
divert(0)
# Configuration version number
-DZ8.12.9`'ifdef(`confCF_VERSION', `/confCF_VERSION')
+DZ8.12.10`'ifdef(`confCF_VERSION', `/confCF_VERSION')
==== //depot/projects/ia64/contrib/sendmail/contrib/domainmap.m4#3 (text+ko) ====
@@ -46,7 +46,7 @@
in the sendmail source tree. For more information, please see the
following URL:
- http://www-dev.cso.uiuc.edu/sendmail/domainmap/
+ http://www-dev.cites.uiuc.edu/sendmail/domainmap/
Feedback is welcome.
==== //depot/projects/ia64/contrib/sendmail/contrib/doublebounce.pl#3 (text+ko) ====
@@ -36,7 +36,7 @@
use Socket;
use Getopt::Std;
-use POSIX;
+use File::Temp;
use Sys::Syslog qw(:DEFAULT setlogsock);
use strict;
use vars qw( $opt_d $tmpfile);
@@ -125,7 +125,7 @@
# The bounced e-mail may be large, so we'd better not try to buffer
# it in memory, get a temporary file.
- $tmpfile = POSIX::tmpnam();
+ $tmpfile = tmpnam();
if (!open(MSG, ">$tmpfile")) {
syslog('err', "Unable to open temporary file $tmpfile");
==== //depot/projects/ia64/contrib/sendmail/contrib/expn.pl#3 (text+ko) ====
@@ -8,6 +8,7 @@
use 5.001;
use IO::Socket;
+use Fcntl;
# system requirements:
# must have 'nslookup' and 'hostname' programs.
@@ -999,7 +1000,7 @@
}
$0 = "$av0 - nslookup of $server";
- open(T,">/tmp/expn$$") || die "open > /tmp/expn$$: $!\n";
+ sysopen(T,"/tmp/expn$$",O_RDWR|O_CREAT|O_EXCL,0600) || die "open > /tmp/expn$$: $!\n";
print T "set querytype=MX\n";
print T "$server\n";
close(T);
==== //depot/projects/ia64/contrib/sendmail/doc/op/op.me#11 (text+ko) ====
@@ -9,7 +9,7 @@
.\" the sendmail distribution.
.\"
.\"
-.\" $Id: op.me,v 8.609.2.23 2003/03/28 05:51:16 ca Exp $
+.\" $Id: op.me,v 8.609.2.26 2003/07/28 21:54:53 ca Exp $
.\"
.\" eqn op.me | pic | troff -me
.\"
@@ -90,7 +90,7 @@
.de Ve
Version \\$2
..
-.Ve $Revision: 8.609.2.23 $
+.Ve $Revision: 8.609.2.26 $
.rm Ve
.sp
For Sendmail Version 8.12
@@ -4307,8 +4307,11 @@
.pp
The
.i queuegroup
-ruleset is used to map an address to a queue group name.
-It should return
+ruleset is used to map a recipient address to a queue group name.
+The input for the ruleset is a recipient address as specified by the
+.sm "SMTP RCPT"
+command.
+The ruleset should return
.b $#
followed by the name of a queue group.
If the return value starts with anything else it is silently ignored.
@@ -8270,7 +8273,7 @@
Mark Roth, roth at uiuc.edu.
For more information,
consult the web site
-.q http://www-dev.cso.uiuc.edu/sendmail/ .
+.q http://www-dev.cites.uiuc.edu/sendmail/ .
.ip nsd
nsd map for IRIX 6.5 and later.
Contributed and supported by Bob Mende of SGI,
@@ -9154,7 +9157,7 @@
For example, using the V8 M4 configuration, include the
following line in your .mc file:
.(b
-define(\`confUSERDB_SPEC\', /etc/mail/userdb.db)
+define(\`confUSERDB_SPEC\', /etc/mail/userdb)
.)b
.sh 1 "OTHER CONFIGURATION"
.pp
@@ -10764,7 +10767,7 @@
.\".sz 10
.\"Eric Allman
.\".sp
-.\"Version $Revision: 8.609.2.23 $
+.\"Version $Revision: 8.609.2.26 $
.\".ce 0
.bp 3
.ce
==== //depot/projects/ia64/contrib/sendmail/include/sm/conf.h#9 (text+ko) ====
@@ -10,7 +10,7 @@
* the sendmail distribution.
*
*
- * $Id: conf.h,v 1.90.2.14 2003/03/06 18:38:06 ca Exp $
+ * $Id: conf.h,v 1.90.2.18 2003/08/20 22:27:44 ca Exp $
*/
/*
@@ -102,7 +102,9 @@
# endif /* ! HASGETUSERSHELL */
# ifdef HPUX10
# define _PATH_SENDMAIL "/usr/sbin/sendmail"
-# define SMRSH_CMDDIR "/var/adm/sm.bin"
+# ifndef SMRSH_CMDDIR
+# define SMRSH_CMDDIR "/var/adm/sm.bin"
+# endif /* ! SMRSH_CMDDIR */
# endif /* HPUX10 */
# ifdef HPUX11
# define HASSETREUID 1 /* setreuid(2) works on HP-UX 11.x */
@@ -110,7 +112,9 @@
# ifndef BROKEN_RES_SEARCH
# define BROKEN_RES_SEARCH 1 /* res_search(unknown) returns h_errno=0 */
# endif /* ! BROKEN_RES_SEARCH */
-# define SMRSH_CMDDIR "/var/adm/sm.bin"
+# ifndef SMRSH_CMDDIR
+# define SMRSH_CMDDIR "/var/adm/sm.bin"
+# endif /* ! SMRSH_CMDDIR */
# define _PATH_SENDMAIL "/usr/sbin/sendmail"
# else /* HPUX11 */
# ifndef NOT_SENDMAIL
@@ -157,6 +161,9 @@
# ifdef _AIX5
# define _AIX4 40300
+# if _AIX5 >= 50200
+# define HASUNSETENV 1 /* has unsetenv(3) call */
+# endif /* _AIX5 >= 50200 */
# endif /* _AIX5 */
/*
@@ -422,7 +429,9 @@
# if SOLARIS >= 20800 || (SOLARIS < 10000 && SOLARIS >= 208)
# undef _PATH_SENDMAILPID /* tmpfs /var/run added in 2.8 */
# define _PATH_SENDMAILPID "/var/run/sendmail.pid"
-# define SMRSH_CMDDIR "/var/adm/sm.bin"
+# ifndef SMRSH_CMDDIR
+# define SMRSH_CMDDIR "/var/adm/sm.bin"
+# endif /* ! SMRSH_CMDDIR */
# define SL_FUDGE 34 /* fudge offset for SyslogPrefixLen */
# endif /* SOLARIS >= 20800 || (SOLARIS < 10000 && SOLARIS >= 208) */
# if SOLARIS >= 20900 || (SOLARIS < 10000 && SOLARIS >= 209)
@@ -907,8 +916,12 @@
# define HASSETUSERCONTEXT 1 /* BSDI-style login classes */
# endif /* __FreeBSD_version >= 222000 */
# if __FreeBSD_version >= 330000 /* 3.3.0-release and later */
-# define SMRSH_CMDDIR "/usr/libexec/sm.bin"
-# define SMRSH_PATH "/bin:/usr/bin"
+# ifndef SMRSH_CMDDIR
+# define SMRSH_CMDDIR "/usr/libexec/sm.bin"
+# endif /* ! SMRSH_CMDDIR */
+# ifndef SMRSH_PATH
+# define SMRSH_PATH "/bin:/usr/bin"
+# endif /* ! SMRSH_PATH */
# endif /* __FreeBSD_version >= 330000 */
# define USESYSCTL 1 /* use sysctl(3) for getting ncpus */
# include <sys/sysctl.h>
@@ -922,7 +935,9 @@
# undef SPT_TYPE
# define SPT_TYPE SPT_BUILTIN /* setproctitle is in libc */
# define HASSETLOGIN 1 /* has setlogin(2) */
-# define HASSETREUID 0 /* OpenBSD has broken setreuid(2) emulation */
+# if OpenBSD < 200305
+# define HASSETREUID 0 /* setreuid(2) broken in OpenBSD < 3.3 */
+# endif /* OpenBSD < 200305 */
# define HASSETEGID 1 /* use setegid(2) to set saved gid */
# define HASURANDOMDEV 1 /* has /dev/urandom(4) */
# if OpenBSD >= 200006
@@ -1360,6 +1375,11 @@
# define HASURANDOMDEV 1 /* 2.0 (at least) has linux/drivers/char/random.c */
# endif /* ! HASURANDOMDEV */
# endif /* (LINUX_VERSION_CODE >= KERNEL_VERSION(2,0,0)) */
+# if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
+# ifndef HASSTRERROR
+# define HASSTRERROR 1 /* has strerror(3) */
+# endif /* HASSTRERROR */
+# endif /* defined(__GLIBC__) && defined(__GLIBC_MINOR__) */
# ifndef TZ_TYPE
# define TZ_TYPE TZ_NONE /* no standard for Linux */
# endif /* ! TZ_TYPE */
@@ -1385,7 +1405,6 @@
** in 2.1 and later, but the APIs appear before the functions.
*/
# if defined(__GLIBC__) && defined(__GLIBC_MINOR__)
-# define HASSTRERROR 1 /* has strerror(3) */
# define GLIBC_VERSION ((__GLIBC__ << 8) + __GLIBC_MINOR__)
# if (GLIBC_VERSION >= 0x201)
# undef IPPROTO_ICMPV6 /* linux #defines, glibc enums */
@@ -2547,7 +2566,7 @@
# endif /* ! EX_CONFIG */
/* pseudo-codes */
-# define EX_QUIT 22 /* drop out of server immediately */
+# define EX_QUIT 22 /* drop out of server immediately */
# define EX_RESTART 23 /* restart sendmail daemon */
# define EX_SHUTDOWN 24 /* shutdown sendmail daemon */
==== //depot/projects/ia64/contrib/sendmail/include/sm/errstring.h#4 (text+ko) ====
@@ -1,13 +1,12 @@
/*
- * Copyright (c) 1998-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 1998-2001, 2003 Sendmail, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- *
- * $Id: errstring.h,v 1.4 2001/06/07 20:04:53 ca Exp $
+ * $Id: errstring.h,v 1.4.4.3 2003/06/24 17:16:10 ca Exp $
*/
/*
@@ -46,6 +45,7 @@
#define E_SMDBBASE (E_PSEUDOBASE + 40) /* base for libsmdb errors */
#define E_LDAPBASE (E_PSEUDOBASE + 70) /* base for LDAP errors */
+
/* libsmdb */
#define SMDBE_OK 0
#define SMDBE_MALLOC (E_SMDBBASE + 1)
@@ -71,9 +71,9 @@
#define SMDBE_NOT_A_VALID_CURSOR (E_SMDBBASE + 21)
#define SMDBE_LAST_ENTRY (E_SMDBBASE + 22)
#define SMDBE_OLD_VERSION (E_SMDBBASE + 23)
+#define SMDBE_VERSION_MISMATCH (E_SMDBBASE + 24)
+
+extern const char *sm_errstring __P((int _errno));
-extern const char *
-sm_errstring __P((
- int _errno));
#endif /* SM_ERRSTRING_H */
==== //depot/projects/ia64/contrib/sendmail/include/sm/io.h#5 (text+ko) ====
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2000-2002 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2003 Sendmail, Inc. and its suppliers.
* All rights reserved.
* Copyright (c) 1990
* The Regents of the University of California. All rights reserved.
@@ -11,7 +11,7 @@
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: io.h,v 1.23 2002/02/23 19:32:17 gshapiro Exp $
+ * $Id: io.h,v 1.23.2.2 2003/09/05 20:35:28 ca Exp $
*/
/*-
@@ -33,6 +33,17 @@
#define SM_IO_APPENDRW 5 /* read-write from eof */
#define SM_IO_RDWRTR 6 /* read-write with truncation indicated */
+# define SM_IO_BINARY 0x0 /* binary mode: not used in Unix */
+#define SM_IS_BINARY(mode) ((mode) & SM_IO_BINARY != 0)
+#define SM_IO_MODE(mode) ((mode) & 0x0f)
+
+#define SM_IO_RDWR_B (SM_IO_RDWR|SM_IO_BINARY)
+#define SM_IO_RDONLY_B (SM_IO_RDONLY|SM_IO_BINARY)
+#define SM_IO_WRONLY_B (SM_IO_WRONLY|SM_IO_BINARY)
+#define SM_IO_APPEND_B (SM_IO_APPEND|SM_IO_BINARY)
+#define SM_IO_APPENDRW_B (SM_IO_APPENDRW|SM_IO_BINARY)
+#define SM_IO_RDWRTR_B (SM_IO_RDWRTR|SM_IO_BINARY)
+
/* for sm_io_fseek, et al api's (exposed) */
#define SM_IO_SEEK_SET 0
#define SM_IO_SEEK_CUR 1
==== //depot/projects/ia64/contrib/sendmail/include/sm/os/sm_os_aix.h#4 (text+ko) ====
@@ -1,12 +1,12 @@
/*
- * Copyright (c) 2000-2001 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2001, 2003 Sendmail, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: sm_os_aix.h,v 1.9 2001/10/09 23:12:13 ca Exp $
+ * $Id: sm_os_aix.h,v 1.9.2.1 2003/04/28 23:11:07 ca Exp $
*/
/*
@@ -33,3 +33,7 @@
# endif /* SM_CONF_SYSLOG */
# endif /* ! _AIX4 */
#endif /* _AIX3 */
+
+#if _AIX5 >= 50200
+# define SM_CONF_LONGLONG 1
+#endif /* _AIX5 >= 50200 */
==== //depot/projects/ia64/contrib/sendmail/include/sm/shm.h#4 (text+ko) ====
@@ -1,12 +1,12 @@
/*
- * Copyright (c) 2000-2002 Sendmail, Inc. and its suppliers.
+ * Copyright (c) 2000-2003 Sendmail, Inc. and its suppliers.
* All rights reserved.
*
* By using this file, you agree to the terms and conditions set
* forth in the LICENSE file which can be found at the top level of
* the sendmail distribution.
*
- * $Id: shm.h,v 1.8 2002/04/10 23:11:35 ca Exp $
+ * $Id: shm.h,v 1.8.2.2 2003/05/17 18:34:16 ca Exp $
*/
#ifndef SM_SHM_H
@@ -29,6 +29,7 @@
extern void *sm_shmstart __P((key_t, int , int , int *, bool));
extern int sm_shmstop __P((void *, int, bool));
+
/* for those braindead systems... (e.g., SunOS 4) */
# ifndef SHM_R
# define SHM_R 0400
==== //depot/projects/ia64/contrib/sendmail/libmilter/README#6 (text+ko) ====
@@ -427,6 +427,7 @@
int argc;
char *argv[];
{
+ bool setconn = false;
int c;
const char *args = "p:";
@@ -443,10 +444,16 @@
exit(EX_USAGE);
}
(void) smfi_setconn(optarg);
+ setconn = true;
break;
}
}
+ if (!setconn)
+ {
+ fprintf(stderr, "%s: Missing required -p argument\n", argv[0]);
+ exit(EX_USAGE);
+ }
if (smfi_register(smfilter) == MI_FAILURE)
{
fprintf(stderr, "smfi_register failed\n");
@@ -457,4 +464,4 @@
/* eof */
-$Revision: 8.35.2.1 $, Last updated $Date: 2002/10/21 14:31:57 $
+$Revision: 8.35.2.2 $, Last updated $Date: 2003/05/26 04:10:06 $
==== //depot/projects/ia64/contrib/sendmail/libmilter/docs/sample.html#4 (text+ko) ====
@@ -379,7 +379,7 @@
char *prog;
{
fprintf(stderr,
- "Usage: %s [-p socket-addr] [-t timeout] [-r reject-addr] [-a add-addr]\n",
+ "Usage: %s -p socket-addr [-t timeout] [-r reject-addr] [-a add-addr]\n",
prog);
}
@@ -388,6 +388,7 @@
int argc;
char **argv;
{
+ bool setconn = FALSE;
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list