summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Blosser2007-02-07 15:05:50 -0600
committerJeremy Blosser2007-02-07 15:09:53 -0600
commitc948aedf8359c94d10a4fbb068c88a0d2089a660 (patch)
tree10a92fae9e472557460cd6837db3adabacffe5a9
parent44352185225127bf27796dbfb1ce506d34ba3d5f (diff)
shadow: Don't try to chk non-existant files.
-rwxr-xr-xsecurity/shadow/CONFIGURE4
-rw-r--r--security/shadow/HISTORY5
2 files changed, 9 insertions, 0 deletions
diff --git a/security/shadow/CONFIGURE b/security/shadow/CONFIGURE
index 2c754b20c9..b2b6f033e8 100755
--- a/security/shadow/CONFIGURE
+++ b/security/shadow/CONFIGURE
@@ -15,18 +15,22 @@ 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" ||
{
message "there are problems with group... runinng grpck
interactively" &&
grpck "$INSTALL_ROOT/etc/group" "$INSTALL_ROOT/etc/gshadow"
}
+ fi
+ if [ -f "$INSTALL_ROOT/etc/shadow" ]; then
pwck -q -r "$INSTALL_ROOT/etc/passwd" "$INSTALL_ROOT/etc/shadow" ||
{
message "there are problems with passwd... runinng grpck
interactively" &&
grpck "$INSTALL_ROOT/etc/passwd" "$INSTALL_ROOT/etc/shadow"
}
+ fi
fi
# the tools give negative return even after successfully fixing stuff
true
diff --git a/security/shadow/HISTORY b/security/shadow/HISTORY
index fea9dcb4df..4fd7db3ddf 100644
--- a/security/shadow/HISTORY
+++ b/security/shadow/HISTORY
@@ -1,3 +1,8 @@
+2007-02-07 Jeremy Blosser <jblosser-smgl@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
+ scary errors when we say we're trying to repair things.
+
2007-02-07 Thomas Orgis <sobukus@sourcemage.org>
* CONFIGURE,FINAL: integrated Jeremy's suggestion of making the
emergency query a one-timer