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

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2009-07-23 20:58:02 +0000 (Thu, 23 Jul 2009)
New Revision: 3040

Modified:
   debian/trunk/debian/changelog
   debian/trunk/debian/shadowconfig.sh
Log:
  * debian/shadowconfig.sh: Do not run shadowoff() and shadowon() in subshell.
    This also remove a dependency on bash (even though /bin/sh would have been
    sufficient). Thanks to Luk for spotting this.


Modified: debian/trunk/debian/changelog
===================================================================
--- debian/trunk/debian/changelog	2009-07-23 20:56:32 UTC (rev 3039)
+++ debian/trunk/debian/changelog	2009-07-23 20:58:02 UTC (rev 3040)
@@ -17,8 +17,11 @@
     document the restriction on groupnames, not usernames.
   * debian/login.pam: pam_securetty included as a required module instead of
     requisite to avoid leak of user name information. Closes: #531341
+  * debian/shadowconfig.sh: Do not run shadowoff() and shadowon() in subshell.
+    This also remove a dependency on bash (even though /bin/sh would have been
+    sufficient). Thanks to Luk for spotting this.
 
- -- Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net>  Thu, 23 Jul 2009 22:55:12 +0200
+ -- Nicolas FRANCOIS (Nekral) <nicolas.francois at centraliens.net>  Thu, 23 Jul 2009 22:56:42 +0200
 
 shadow (1:4.1.4.1-1) unstable; urgency=low
 

Modified: debian/trunk/debian/shadowconfig.sh
===================================================================
--- debian/trunk/debian/shadowconfig.sh	2009-07-23 20:56:32 UTC (rev 3039)
+++ debian/trunk/debian/shadowconfig.sh	2009-07-23 20:58:02 UTC (rev 3040)
@@ -4,32 +4,26 @@
 set -e
 
 shadowon () {
-bash<<- EOF
     set -e
     pwck -q
     grpck -p
     pwconv
     grpconv
-    cd /etc
-    chown root:root passwd group
-    chmod 644 passwd group
-    chown root:shadow shadow gshadow
-    chmod 640 shadow gshadow
-EOF
+    chown root:root /etc/passwd /etc/group
+    chmod 644 /etc/passwd /etc/group
+    chown root:shadow /etc/shadow /etc/gshadow
+    chmod 640 /etc/shadow /etc/gshadow
 }
 
 shadowoff () {
-bash<<- EOF
     set -e
     pwck -q
     grpck -p
     pwunconv
     grpunconv
-    cd /etc
     # sometimes the passwd perms get munged
-    chown root:root passwd group
-    chmod 644 passwd group
-EOF
+    chown root:root /etc/passwd /etc/group
+    chmod 644 /etc/passwd /etc/group
 }
 
 case "$1" in