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

[Alexander Gattin]

Author: xrgtn-guest
Date: 2006-03-04 23:26:37 +0000 (Sat, 04 Mar 2006)
New Revision: 887

Modified:
   trunk/debian/passwd.config
Log:
more bulletproof string checks

Modified: trunk/debian/passwd.config
===================================================================
--- trunk/debian/passwd.config	2006-03-01 19:15:28 UTC (rev 886)
+++ trunk/debian/passwd.config	2006-03-04 23:26:37 UTC (rev 887)
@@ -37,16 +37,13 @@
 		return 0
 	fi
 
-	if [ -e /etc/shadow ] && \
-	   [ "`grep ^root: /etc/shadow | cut -d : -f 2`" ] && \
-	   [ "`grep ^root: /etc/shadow | cut -d : -f 2`" != '*' ]; then
-		return 0
+	if [ -e /etc/shadow ] ; then
+		RSP="`grep ^root: /etc/shadow | cut -d : -f 2`"
+		[ -n "$RSP" ] && [ "x$RSP" != 'x*' ] && return 0
 	fi
 	
-	if [ "`grep ^root: /etc/passwd | cut -d : -f 2`" ] && \
-	   [ "`grep ^root: /etc/passwd | cut -d : -f 2`" != 'x' ]; then
-		return 0
-	fi
+	RPW="`grep ^root: /etc/passwd | cut -d : -f 2`"
+	[ -n "$RPW" ] && [ "x$RPW" != 'xx' ] && return 0
 
 	return 1
 }