[Pkg-shadow-commits] r867 - trunk/debian

[Christian Perrier]

Author: bubulle
Date: 2006-02-21 09:54:16 +0000 (Tue, 21 Feb 2006)
New Revision: 867

Modified:
   trunk/debian/changelog
   trunk/debian/passwd.config
Log:
Better handling of root password set to '!'


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2006-02-20 19:14:47 UTC (rev 866)
+++ trunk/debian/changelog	2006-02-21 09:54:16 UTC (rev 867)
@@ -7,6 +7,10 @@
   * Debian packaging fixes:
     - Stop replacing manpages-it as a new release of that package removed
       the conflicting manpages
+    - passwd.config:
+      Better POSIX compliance and avoid failure if root password is set to '!'
+      Thanks to Vagrant Cascadian for reporting and providing the patch
+      Closes: #353813
 
  -- Christian Perrier <bubulle at debian.org>  Tue, 14 Feb 2006 14:21:43 +0100
 

Modified: trunk/debian/passwd.config
===================================================================
--- trunk/debian/passwd.config	2006-02-20 19:14:47 UTC (rev 866)
+++ trunk/debian/passwd.config	2006-02-21 09:54:16 UTC (rev 867)
@@ -38,8 +38,8 @@
 	fi
 
 	if [ -e /etc/shadow ] && \
-	   [ "`grep ^root: /etc/shadow | cut -d : -f 2`" -a \
-	     "`grep ^root: /etc/shadow | cut -d : -f 2`" != '*' ]; then
+	   [ "`grep ^root: /etc/shadow | cut -d : -f 2`" ] && \
+	   [ "`grep ^root: /etc/shadow | cut -d : -f 2`" != '*' ]; then
 		return 0
 	fi