From 96866ff296122eba324e35eedd2b75f8afb71b08 Mon Sep 17 00:00:00 2001 From: nekral-guest Date: Thu, 23 Jul 2009 20:58:02 +0000 Subject: [PATCH] * 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. --- debian/changelog | 5 ++++- debian/shadowconfig.sh | 18 ++++++------------ 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1b70655c..07c6ed92 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,8 +17,11 @@ shadow (1:4.1.4.2-1) unstable; urgency=low 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) Thu, 23 Jul 2009 22:55:12 +0200 + -- Nicolas FRANCOIS (Nekral) Thu, 23 Jul 2009 22:56:42 +0200 shadow (1:4.1.4.1-1) unstable; urgency=low diff --git a/debian/shadowconfig.sh b/debian/shadowconfig.sh index 7d7f203b..49953238 100644 --- a/debian/shadowconfig.sh +++ b/debian/shadowconfig.sh @@ -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