Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to stable-rc-0.7 grimoire by Jaka Kranjc (e64e6f0f5485d67b9706b826cd3e99ac2e1b9e2d)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Jaka Kranjc <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to stable-rc-0.7 grimoire by Jaka Kranjc (e64e6f0f5485d67b9706b826cd3e99ac2e1b9e2d)
  • Date: Wed, 14 Feb 2007 14:17:48 -0600

GIT changes to stable-rc-0.7 grimoire by Jaka Kranjc
<lynxlynxlynx AT sourcemage.org>:

security/shadow/CONFIGURE | 14 +++++---------
security/shadow/HISTORY | 6 ++++++
2 files changed, 11 insertions(+), 9 deletions(-)

New commits:
commit e64e6f0f5485d67b9706b826cd3e99ac2e1b9e2d
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

simplify shadow by not pretending to work on INSTALL_ROOT - pwck does,
but pwconv not; this also makes the existence check for the shadow
files unnecessary
(cherry picked from commit 9e41ddb1b6b997a33656708754ce46f6aa1e7eca)

commit b700477792fe54cc742ef5a702bd22f2302b16f1
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>

resolved pwconv/grpconv typo in shadow
(cherry picked from commit 983d10e36a60751d5eb3e96fe8e37879dfcd8ab6)

diff --git a/security/shadow/CONFIGURE b/security/shadow/CONFIGURE
index b2b6f03..7ad9599 100755
--- a/security/shadow/CONFIGURE
+++ b/security/shadow/CONFIGURE
@@ -15,22 +15,18 @@ else
fi &&
if [[ "$SHADOW_CONV" == y ]] || [[ "$SHADOW_RECONV" == y ]]; then
message "OK, checking your user and group accounts" &&
- if [ -f "$INSTALL_ROOT/etc/gshadow" ]; then
- grpck -r "$INSTALL_ROOT/etc/group" "$INSTALL_ROOT/etc/gshadow" ||
+ grpck -r ||
{
message "there are problems with group... runinng grpck
interactively" &&
- grpck "$INSTALL_ROOT/etc/group" "$INSTALL_ROOT/etc/gshadow"
+ grpck
}
- fi
- if [ -f "$INSTALL_ROOT/etc/shadow" ]; then
- pwck -q -r "$INSTALL_ROOT/etc/passwd" "$INSTALL_ROOT/etc/shadow" ||
+ pwck -q -r ||
{
- message "there are problems with passwd... runinng grpck
+ message "there are problems with passwd... runinng pwpck
interactively" &&
- grpck "$INSTALL_ROOT/etc/passwd" "$INSTALL_ROOT/etc/shadow"
+ pwck
}
- fi
fi
# the tools give negative return even after successfully fixing stuff
true
diff --git a/security/shadow/HISTORY b/security/shadow/HISTORY
index 4fd7db3..d4ee404 100644
--- a/security/shadow/HISTORY
+++ b/security/shadow/HISTORY
@@ -1,3 +1,9 @@
+2007-02-07 Thomas Orgis <sobukus AT sourcemage.org>
+ * CONFIGURE: neverending story... really run pwck when checking
passwd files!
+ * CONFIGURE: also removed the whole $INSTALL_ROOT thing: it is not
for real,
+ pwconv and grpconv will _always_ work on /etc, only the check
programs accept
+ the files as parameters - all account stuff operates on host box!
+
2007-02-07 Jeremy Blosser <jblosser-smgl AT firinn.org>
* CONFIGURE: Also don't bother trying to check files that aren't there
and are going to fail. May not be the best fix but for now it
avoids



  • [SM-Commit] GIT changes to stable-rc-0.7 grimoire by Jaka Kranjc (e64e6f0f5485d67b9706b826cd3e99ac2e1b9e2d), Jaka Kranjc, 02/14/2007

Archive powered by MHonArc 2.6.24.

Top of Page