Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/gnu/dist/sendmail resolve conflicts. (mainly due to $Id$ mis...
details: https://anonhg.NetBSD.org/src/rev/103f356035da
branches: trunk
changeset: 487845:103f356035da
user: itojun <itojun%NetBSD.org@localhost>
date: Tue Jun 13 17:18:26 2000 +0000
description:
resolve conflicts. (mainly due to $Id$ mistake in past import)
diffstat:
gnu/dist/sendmail/RELEASE_NOTES | 13 +++-
gnu/dist/sendmail/cf/cf/generic-bsd4.4.cf | 6 +-
gnu/dist/sendmail/cf/cf/generic-hpux10.cf | 6 +-
gnu/dist/sendmail/cf/cf/generic-hpux9.cf | 6 +-
gnu/dist/sendmail/cf/cf/generic-linux.cf | 6 +-
gnu/dist/sendmail/cf/cf/generic-osf1.cf | 6 +-
gnu/dist/sendmail/cf/cf/generic-solaris2.cf | 6 +-
gnu/dist/sendmail/cf/cf/generic-sunos4.1.cf | 6 +-
gnu/dist/sendmail/cf/cf/generic-ultrix4.cf | 6 +-
gnu/dist/sendmail/cf/m4/version.m4 | 4 +-
gnu/dist/sendmail/cf/ostype/solaris2.pre5.m4 | 2 +-
gnu/dist/sendmail/devtools/OS/OSF1.V5.0 | 2 +-
gnu/dist/sendmail/libmilter/Makefile | 2 +-
gnu/dist/sendmail/libsmdb/Makefile | 2 +-
gnu/dist/sendmail/libsmutil/Makefile | 2 +-
gnu/dist/sendmail/sendmail/deliver.c | 91 ++++++++++++++++++++++++++-
gnu/dist/sendmail/sendmail/main.c | 53 +++++++++++++--
gnu/dist/sendmail/sendmail/readcf.c | 7 +-
gnu/dist/sendmail/sendmail/recipient.c | 32 ++++++++-
gnu/dist/sendmail/sendmail/util.c | 14 ++++-
gnu/dist/sendmail/sendmail/version.c | 4 +-
21 files changed, 221 insertions(+), 55 deletions(-)
diffs (truncated from 795 to 300 lines):
diff -r 55ec96b4d27f -r 103f356035da gnu/dist/sendmail/RELEASE_NOTES
--- a/gnu/dist/sendmail/RELEASE_NOTES Tue Jun 13 17:13:17 2000 +0000
+++ b/gnu/dist/sendmail/RELEASE_NOTES Tue Jun 13 17:18:26 2000 +0000
@@ -1,11 +1,22 @@
SENDMAIL RELEASE NOTES
- Id: RELEASE_NOTES,v 8.561 2000/04/06 23:51:49 gshapiro Exp
+ Id: RELEASE_NOTES,v 8.561.4.6 2000/06/07 07:39:53 gshapiro 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.10.2/8.10.2 2000/06/07
+ SECURITY: Work around broken Linux setuid() implementation.
+ On Linux, a normal user process has the ability to subvert
+ the setuid() call such that it is impossible for a root
+ process to drop its privileges. Problem noted by Wojciech
+ Purczynski of elzabsoft.pl.
+ SECURITY: Add more vigilance around set*uid(), setgid(), setgroups(),
+ initgroups(), and chroot() calls.
+ Added Files:
+ test/t_setuid.c
+
8.10.1/8.10.1 2000/04/06
SECURITY: Limit the choice of outgoing (client-side) SMTP
Authentication mechanisms to those specified in
diff -r 55ec96b4d27f -r 103f356035da gnu/dist/sendmail/cf/cf/generic-bsd4.4.cf
--- a/gnu/dist/sendmail/cf/cf/generic-bsd4.4.cf Tue Jun 13 17:13:17 2000 +0000
+++ b/gnu/dist/sendmail/cf/cf/generic-bsd4.4.cf Tue Jun 13 17:18:26 2000 +0000
@@ -16,8 +16,8 @@
#####
##### SENDMAIL CONFIGURATION FILE
#####
-##### built by gshapiro%horsey.gshapiro.net@localhost on Thu Apr 6 14:36:11 PDT 2000
-##### in /usr/local/src/sendmail/devel/OpenSource/sendmail-8.10.1/cf/cf
+##### built by gshapiro%horsey.gshapiro.net@localhost on Wed Jun 7 10:00:54 PDT 2000
+##### in /usr/local/src/sendmail/devel/8.10/OpenSource/sendmail-8.10.2/cf/cf
##### using ../ as configuration include directory
#####
######################################################################
@@ -113,7 +113,7 @@
CPREDIRECT
# Configuration version number
-DZ8.10.1
+DZ8.10.2
###############
diff -r 55ec96b4d27f -r 103f356035da gnu/dist/sendmail/cf/cf/generic-hpux10.cf
--- a/gnu/dist/sendmail/cf/cf/generic-hpux10.cf Tue Jun 13 17:13:17 2000 +0000
+++ b/gnu/dist/sendmail/cf/cf/generic-hpux10.cf Tue Jun 13 17:18:26 2000 +0000
@@ -16,8 +16,8 @@
#####
##### SENDMAIL CONFIGURATION FILE
#####
-##### built by gshapiro%horsey.gshapiro.net@localhost on Thu Apr 6 14:36:13 PDT 2000
-##### in /usr/local/src/sendmail/devel/OpenSource/sendmail-8.10.1/cf/cf
+##### built by gshapiro%horsey.gshapiro.net@localhost on Wed Jun 7 10:00:57 PDT 2000
+##### in /usr/local/src/sendmail/devel/8.10/OpenSource/sendmail-8.10.2/cf/cf
##### using ../ as configuration include directory
#####
######################################################################
@@ -114,7 +114,7 @@
CPREDIRECT
# Configuration version number
-DZ8.10.1
+DZ8.10.2
###############
diff -r 55ec96b4d27f -r 103f356035da gnu/dist/sendmail/cf/cf/generic-hpux9.cf
--- a/gnu/dist/sendmail/cf/cf/generic-hpux9.cf Tue Jun 13 17:13:17 2000 +0000
+++ b/gnu/dist/sendmail/cf/cf/generic-hpux9.cf Tue Jun 13 17:18:26 2000 +0000
@@ -16,8 +16,8 @@
#####
##### SENDMAIL CONFIGURATION FILE
#####
-##### built by gshapiro%horsey.gshapiro.net@localhost on Thu Apr 6 14:36:13 PDT 2000
-##### in /usr/local/src/sendmail/devel/OpenSource/sendmail-8.10.1/cf/cf
+##### built by gshapiro%horsey.gshapiro.net@localhost on Wed Jun 7 10:00:57 PDT 2000
+##### in /usr/local/src/sendmail/devel/8.10/OpenSource/sendmail-8.10.2/cf/cf
##### using ../ as configuration include directory
#####
######################################################################
@@ -114,7 +114,7 @@
CPREDIRECT
# Configuration version number
-DZ8.10.1
+DZ8.10.2
###############
diff -r 55ec96b4d27f -r 103f356035da gnu/dist/sendmail/cf/cf/generic-linux.cf
--- a/gnu/dist/sendmail/cf/cf/generic-linux.cf Tue Jun 13 17:13:17 2000 +0000
+++ b/gnu/dist/sendmail/cf/cf/generic-linux.cf Tue Jun 13 17:18:26 2000 +0000
@@ -16,8 +16,8 @@
#####
##### SENDMAIL CONFIGURATION FILE
#####
-##### built by gshapiro%horsey.gshapiro.net@localhost on Thu Apr 6 14:36:13 PDT 2000
-##### in /usr/local/src/sendmail/devel/OpenSource/sendmail-8.10.1/cf/cf
+##### built by gshapiro%horsey.gshapiro.net@localhost on Wed Jun 7 10:00:58 PDT 2000
+##### in /usr/local/src/sendmail/devel/8.10/OpenSource/sendmail-8.10.2/cf/cf
##### using ../ as configuration include directory
#####
######################################################################
@@ -117,7 +117,7 @@
CPREDIRECT
# Configuration version number
-DZ8.10.1
+DZ8.10.2
###############
diff -r 55ec96b4d27f -r 103f356035da gnu/dist/sendmail/cf/cf/generic-osf1.cf
--- a/gnu/dist/sendmail/cf/cf/generic-osf1.cf Tue Jun 13 17:13:17 2000 +0000
+++ b/gnu/dist/sendmail/cf/cf/generic-osf1.cf Tue Jun 13 17:18:26 2000 +0000
@@ -16,8 +16,8 @@
#####
##### SENDMAIL CONFIGURATION FILE
#####
-##### built by gshapiro%horsey.gshapiro.net@localhost on Thu Apr 6 14:36:14 PDT 2000
-##### in /usr/local/src/sendmail/devel/OpenSource/sendmail-8.10.1/cf/cf
+##### built by gshapiro%horsey.gshapiro.net@localhost on Wed Jun 7 10:00:58 PDT 2000
+##### in /usr/local/src/sendmail/devel/8.10/OpenSource/sendmail-8.10.2/cf/cf
##### using ../ as configuration include directory
#####
######################################################################
@@ -114,7 +114,7 @@
CPREDIRECT
# Configuration version number
-DZ8.10.1
+DZ8.10.2
###############
diff -r 55ec96b4d27f -r 103f356035da gnu/dist/sendmail/cf/cf/generic-solaris2.cf
--- a/gnu/dist/sendmail/cf/cf/generic-solaris2.cf Tue Jun 13 17:13:17 2000 +0000
+++ b/gnu/dist/sendmail/cf/cf/generic-solaris2.cf Tue Jun 13 17:18:26 2000 +0000
@@ -16,8 +16,8 @@
#####
##### SENDMAIL CONFIGURATION FILE
#####
-##### built by gshapiro%horsey.gshapiro.net@localhost on Thu Apr 6 14:36:14 PDT 2000
-##### in /usr/local/src/sendmail/devel/OpenSource/sendmail-8.10.1/cf/cf
+##### built by gshapiro%horsey.gshapiro.net@localhost on Wed Jun 7 10:00:58 PDT 2000
+##### in /usr/local/src/sendmail/devel/8.10/OpenSource/sendmail-8.10.2/cf/cf
##### using ../ as configuration include directory
#####
######################################################################
@@ -113,7 +113,7 @@
CPREDIRECT
# Configuration version number
-DZ8.10.1
+DZ8.10.2
###############
diff -r 55ec96b4d27f -r 103f356035da gnu/dist/sendmail/cf/cf/generic-sunos4.1.cf
--- a/gnu/dist/sendmail/cf/cf/generic-sunos4.1.cf Tue Jun 13 17:13:17 2000 +0000
+++ b/gnu/dist/sendmail/cf/cf/generic-sunos4.1.cf Tue Jun 13 17:18:26 2000 +0000
@@ -16,8 +16,8 @@
#####
##### SENDMAIL CONFIGURATION FILE
#####
-##### built by gshapiro%horsey.gshapiro.net@localhost on Thu Apr 6 14:36:14 PDT 2000
-##### in /usr/local/src/sendmail/devel/OpenSource/sendmail-8.10.1/cf/cf
+##### built by gshapiro%horsey.gshapiro.net@localhost on Wed Jun 7 10:00:59 PDT 2000
+##### in /usr/local/src/sendmail/devel/8.10/OpenSource/sendmail-8.10.2/cf/cf
##### using ../ as configuration include directory
#####
######################################################################
@@ -114,7 +114,7 @@
CPREDIRECT
# Configuration version number
-DZ8.10.1
+DZ8.10.2
###############
diff -r 55ec96b4d27f -r 103f356035da gnu/dist/sendmail/cf/cf/generic-ultrix4.cf
--- a/gnu/dist/sendmail/cf/cf/generic-ultrix4.cf Tue Jun 13 17:13:17 2000 +0000
+++ b/gnu/dist/sendmail/cf/cf/generic-ultrix4.cf Tue Jun 13 17:18:26 2000 +0000
@@ -16,8 +16,8 @@
#####
##### SENDMAIL CONFIGURATION FILE
#####
-##### built by gshapiro%horsey.gshapiro.net@localhost on Thu Apr 6 14:36:14 PDT 2000
-##### in /usr/local/src/sendmail/devel/OpenSource/sendmail-8.10.1/cf/cf
+##### built by gshapiro%horsey.gshapiro.net@localhost on Wed Jun 7 10:01:00 PDT 2000
+##### in /usr/local/src/sendmail/devel/8.10/OpenSource/sendmail-8.10.2/cf/cf
##### using ../ as configuration include directory
#####
######################################################################
@@ -114,7 +114,7 @@
CPREDIRECT
# Configuration version number
-DZ8.10.1
+DZ8.10.2
###############
diff -r 55ec96b4d27f -r 103f356035da gnu/dist/sendmail/cf/m4/version.m4
--- a/gnu/dist/sendmail/cf/m4/version.m4 Tue Jun 13 17:13:17 2000 +0000
+++ b/gnu/dist/sendmail/cf/m4/version.m4 Tue Jun 13 17:18:26 2000 +0000
@@ -11,8 +11,8 @@
# the sendmail distribution.
#
#
-VERSIONID(`Id: version.m4,v 8.39 2000/04/06 20:30:53 gshapiro Exp')
+VERSIONID(`Id: version.m4,v 8.39.6.2 2000/06/07 07:39:55 gshapiro Exp')
#
divert(0)
# Configuration version number
-DZ8.10.1`'ifdef(`confCF_VERSION', `/confCF_VERSION')
+DZ8.10.2`'ifdef(`confCF_VERSION', `/confCF_VERSION')
diff -r 55ec96b4d27f -r 103f356035da gnu/dist/sendmail/cf/ostype/solaris2.pre5.m4
--- a/gnu/dist/sendmail/cf/ostype/solaris2.pre5.m4 Tue Jun 13 17:13:17 2000 +0000
+++ b/gnu/dist/sendmail/cf/ostype/solaris2.pre5.m4 Tue Jun 13 17:18:26 2000 +0000
@@ -17,7 +17,7 @@
divert(0)
-VERSIONID(`Id: solaris2.pre5.m4,v 1.1 1999/09/25 01:17:44 ca Exp')
+VERSIONID(`Id: solaris2.pre5.m4,v 8.1 1999/09/25 08:17:44 ca Exp')
divert(-1)
_DEFIFNOT(`LOCAL_MAILER_FLAGS', `SnE9')
diff -r 55ec96b4d27f -r 103f356035da gnu/dist/sendmail/devtools/OS/OSF1.V5.0
--- a/gnu/dist/sendmail/devtools/OS/OSF1.V5.0 Tue Jun 13 17:13:17 2000 +0000
+++ b/gnu/dist/sendmail/devtools/OS/OSF1.V5.0 Tue Jun 13 17:18:26 2000 +0000
@@ -1,4 +1,4 @@
-# Id: OSF1.V5.0,v 1.1 2000/03/23 00:14:01 gshapiro Exp
+# Id: OSF1.V5.0,v 8.1 2000/03/23 00:14:01 gshapiro Exp
define(`confCC', `cc -std1 -Olimit 1000')
define(`confMAPDEF', `-DNDBM -DNIS -DMAP_REGEX')
define(`confENVDEF', `-DHASSNPRINTF=1')
diff -r 55ec96b4d27f -r 103f356035da gnu/dist/sendmail/libmilter/Makefile
--- a/gnu/dist/sendmail/libmilter/Makefile Tue Jun 13 17:13:17 2000 +0000
+++ b/gnu/dist/sendmail/libmilter/Makefile Tue Jun 13 17:18:26 2000 +0000
@@ -1,4 +1,4 @@
-# Id: Makefile,v 1.1 1999/11/04 00:03:40 ca Exp
+# Id: Makefile,v 8.1 1999/11/04 00:03:40 ca Exp
SHELL= /bin/sh
BUILD= ./Build
diff -r 55ec96b4d27f -r 103f356035da gnu/dist/sendmail/libsmdb/Makefile
--- a/gnu/dist/sendmail/libsmdb/Makefile Tue Jun 13 17:13:17 2000 +0000
+++ b/gnu/dist/sendmail/libsmdb/Makefile Tue Jun 13 17:18:26 2000 +0000
@@ -1,4 +1,4 @@
-# Id: Makefile,v 1.2 1999/09/23 22:36:29 ca Exp
+# Id: Makefile,v 8.2 1999/09/23 22:36:29 ca Exp
SHELL= /bin/sh
BUILD= ./Build
diff -r 55ec96b4d27f -r 103f356035da gnu/dist/sendmail/libsmutil/Makefile
--- a/gnu/dist/sendmail/libsmutil/Makefile Tue Jun 13 17:13:17 2000 +0000
+++ b/gnu/dist/sendmail/libsmutil/Makefile Tue Jun 13 17:18:26 2000 +0000
@@ -1,4 +1,4 @@
-# Id: Makefile,v 1.2 1999/09/23 22:36:32 ca Exp
+# Id: Makefile,v 8.2 1999/09/23 22:36:32 ca Exp
SHELL= /bin/sh
BUILD= ./Build
diff -r 55ec96b4d27f -r 103f356035da gnu/dist/sendmail/sendmail/deliver.c
--- a/gnu/dist/sendmail/sendmail/deliver.c Tue Jun 13 17:13:17 2000 +0000
+++ b/gnu/dist/sendmail/sendmail/deliver.c Tue Jun 13 17:18:26 2000 +0000
@@ -12,7 +12,7 @@
*/
#ifndef lint
-static char id[] = "@(#)Id: deliver.c,v 8.600 2000/04/06 00:50:14 gshapiro Exp";
+static char id[] = "@(#)Id: deliver.c,v 8.600.4.3 2000/05/28 17:47:08 gshapiro Exp";
#endif /* ! lint */
#include <sendmail.h>
@@ -1860,8 +1860,11 @@
u = ctladdr->q_user;
if (initgroups(u, ctladdr->q_gid) == -1 && suidwarn)
+ {
syserr("openmailer: initgroups(%s, %d) failed",
u, ctladdr->q_gid);
+ exit(EX_TEMPFAIL);
+ }
}
else
{
@@ -1869,7 +1872,10 @@
gidset[0] = ctladdr->q_gid;
Home |
Main Index |
Thread Index |
Old Index