[Pkg-shadow-commits] r1081 - in branches/sarge: debian libmisc src

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2006-08-16 16:01:16 +0000 (Wed, 16 Aug 2006)
New Revision: 1081

Modified:
   branches/sarge/debian/changelog
   branches/sarge/debian/control
   branches/sarge/libmisc/pwdcheck.c
   branches/sarge/src/passwd.c
Log:
Revert the srage branch to sarge5.


Modified: branches/sarge/debian/changelog
===================================================================
--- branches/sarge/debian/changelog	2006-08-11 21:57:42 UTC (rev 1080)
+++ branches/sarge/debian/changelog	2006-08-16 16:01:16 UTC (rev 1081)
@@ -1,26 +1,10 @@
-shadow (1:4.0.3-31sarge8) proposed-updates; urgency=low
+shadow (1:4.0.3-31sarge6) stable-security; urgency=high
 
-  * Add Nicolas FRANCOIS to the Uploaders.
-
-  * SECURITY UPDATE: CVE-2006-3378: Root privilege escalation.
-  * src/passwd.c:
-    - Check for failing setuid() (which can happen if user hits PAM
-      limits). Before, passwd continued to run as root and executed
-      chfn/chsh/gpasswd as root instead of as the user.
-    - Thanks to Sune Kloppenborg Jeppesen for pointing this out.
-
- -- Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net>  Sat,  5 Aug 2006 02:53:20 +0200
-
-shadow (1:4.0.3-31sarge7) proposed-updates; urgency=high
-
-  * Bump version to circumvent a 4.0.3-31sarge6 version full of autotools
-    cruft which was uploaded to proposed-updates
   * passwd.postinst: On upgrades from any prior version, chmod 600 various
     base-config and d-i log files that might contain sensative information,
-    including in some cases, passwords. Thanks to Joey Hess for the patch.
-    Closes: #356939
+    including in some cases, passwords. CLoses: #356939
 
- -- Christian Perrier <bubulle at kheops.perrier.eu.org>  Fri, 21 Jul 2006 09:23:46 +0200
+ -- Joey Hess <joeyh at debian.org>  Tue, 14 Mar 2006 16:14:26 -0500
 
 shadow (1:4.0.3-31sarge5) testing-proposed-updates; urgency=high
 

Modified: branches/sarge/debian/control
===================================================================
--- branches/sarge/debian/control	2006-08-11 21:57:42 UTC (rev 1080)
+++ branches/sarge/debian/control	2006-08-16 16:01:16 UTC (rev 1081)
@@ -3,7 +3,7 @@
 Priority: required
 Maintainer: Shadow package maintainers <pkg-shadow-devel at lists.alioth.debian.org>
 Standards-Version: 3.6.1.1
-Uploaders: Christian Perrier <bubulle at debian.org>, Sam Hartman <hartmans at debian.org>, Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net>
+Uploaders: Christian Perrier <bubulle at debian.org>, Sam Hartman <hartmans at debian.org>
 Build-Depends: autoconf, automake1.7, libtool, bzip2, gettext, libpam0g-dev [!hurd-i386], texinfo, file, debhelper (>= 4.1.16), po-debconf, libpam-runtime (>= 0.76-14)
 
 Package: passwd

Modified: branches/sarge/libmisc/pwdcheck.c
===================================================================
--- branches/sarge/libmisc/pwdcheck.c	2006-08-11 21:57:42 UTC (rev 1080)
+++ branches/sarge/libmisc/pwdcheck.c	2006-08-16 16:01:16 UTC (rev 1081)
@@ -1,7 +1,7 @@
 #include <config.h>
 
 #include "rcsid.h"
-RCSID("$Id: pwdcheck.c 6 2005-03-20 15:34:28Z bubulle $")
+RCSID("$Id$")
 
 #include "prototypes.h"
 #include "defines.h"


Property changes on: branches/sarge/libmisc/pwdcheck.c
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision

Modified: branches/sarge/src/passwd.c
===================================================================
--- branches/sarge/src/passwd.c	2006-08-11 21:57:42 UTC (rev 1080)
+++ branches/sarge/src/passwd.c	2006-08-16 16:01:16 UTC (rev 1081)
@@ -30,7 +30,7 @@
 #include <config.h>
 
 #include "rcsid.h"
-RCSID (PKG_VER "$Id: passwd.c 6 2005-03-20 15:34:28Z bubulle $")
+RCSID (PKG_VER "$Id$")
 #include "prototypes.h"
 #include "defines.h"
 #include <sys/types.h>
@@ -958,13 +958,7 @@
 	if (argc > 1 && argv[1][0] == '-' && strchr ("gfs", argv[1][1])) {
 		char buf[200];
 
-		uid_t uid = getuid();
-		setuid (uid);
-		if (getuid() != uid) {
-		    perror("cannot set user id");
-		    SYSLOG ((LOG_ERR, "setuid to %i failed", uid));
-		    exit(E_FAILURE);
-		}
+		setuid (getuid ());
 		switch (argv[1][1]) {
 		case 'g':
 			argv[1] = GPASSWD_PROGRAM;	/* XXX warning: const */


Property changes on: branches/sarge/src/passwd.c
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision