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

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2006-08-16 16:23:45 +0000 (Wed, 16 Aug 2006)
New Revision: 1083

Added:
   branches/sarge/lib/.indent.pro
Modified:
   branches/sarge/debian/changelog
   branches/sarge/debian/passwd.postinst
   branches/sarge/libmisc/pwdcheck.c
   branches/sarge/src/passwd.c
Log:
Re-merge with shadow 4.0.3-31sarge5.


Modified: branches/sarge/debian/changelog
===================================================================
--- branches/sarge/debian/changelog	2006-08-16 16:04:28 UTC (rev 1082)
+++ branches/sarge/debian/changelog	2006-08-16 16:23:45 UTC (rev 1083)
@@ -1,11 +1,3 @@
-shadow (1:4.0.3-31sarge6) stable-security; urgency=high
-
-  * 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. CLoses: #356939
-
- -- 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
 
   * Re-apply the debian/patches/036_CAN-2004-1001_passwd_check patch

Modified: branches/sarge/debian/passwd.postinst
===================================================================
--- branches/sarge/debian/passwd.postinst	2006-08-16 16:04:28 UTC (rev 1082)
+++ branches/sarge/debian/passwd.postinst	2006-08-16 16:23:45 UTC (rev 1083)
@@ -10,19 +10,6 @@
 
 if test "$1" = configure
 then
-    # Fix permissions on various log files from old versions of the debian
-    # installer, some unrelated to passwd but we decided to put the fix
-    # here since there was no better place. This can safely be removed
-    # after etch is released.
-    if dpkg --compare-versions "$2" lt "1:4.0.3-31sarge6"; then
-	    for log in /var/log/base-config* \
-		    $(find /var/log/debian-installer/ /var/log/installer/ -type f 2>/dev/null ); do
-		if [ -e "$log" ]; then
-			chmod 600 "$log"
-		fi
-            done
-    fi
-    
     rm -f /etc/pam.d/passwd.pre-upgrade 2>/dev/null
 	if ! getent group shadow | grep -q '^shadow:[^:]*:42'
 	then

Added: branches/sarge/lib/.indent.pro
===================================================================
--- branches/sarge/lib/.indent.pro	2006-08-16 16:04:28 UTC (rev 1082)
+++ branches/sarge/lib/.indent.pro	2006-08-16 16:23:45 UTC (rev 1083)
@@ -0,0 +1,4 @@
+-kr
+-i8
+-bad
+-pcs

Modified: branches/sarge/libmisc/pwdcheck.c
===================================================================
--- branches/sarge/libmisc/pwdcheck.c	2006-08-16 16:04:28 UTC (rev 1082)
+++ branches/sarge/libmisc/pwdcheck.c	2006-08-16 16:23:45 UTC (rev 1083)
@@ -1,7 +1,7 @@
 #include <config.h>
 
 #include "rcsid.h"
-RCSID("$Id: pwdcheck.c 1081 2006-08-16 16:01:16Z nekral-guest $")
+RCSID("$Id: pwdcheck.c 6 2005-03-20 15:34:28Z bubulle $")
 
 #include "prototypes.h"
 #include "defines.h"

Modified: branches/sarge/src/passwd.c
===================================================================
--- branches/sarge/src/passwd.c	2006-08-16 16:04:28 UTC (rev 1082)
+++ branches/sarge/src/passwd.c	2006-08-16 16:23:45 UTC (rev 1083)
@@ -30,7 +30,7 @@
 #include <config.h>
 
 #include "rcsid.h"
-RCSID (PKG_VER "$Id: passwd.c 1081 2006-08-16 16:01:16Z nekral-guest $")
+RCSID (PKG_VER "$Id: passwd.c 6 2005-03-20 15:34:28Z bubulle $")
 #include "prototypes.h"
 #include "defines.h"
 #include <sys/types.h>