Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (c0695802d6900775e09054cef09412bdd1fd8647)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (c0695802d6900775e09054cef09412bdd1fd8647)
  • Date: Mon, 22 Jan 2007 05:58:46 -0600

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

security/shadow/CONFIGURE | 18 ++++++++++++++++++
security/shadow/FINAL | 9 ++++++---
security/shadow/HISTORY | 4 ++++
3 files changed, 28 insertions(+), 3 deletions(-)

New commits:
commit c0695802d6900775e09054cef09412bdd1fd8647
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

shadow: fixing bug 8834 for good, hopefully

diff --git a/security/shadow/CONFIGURE b/security/shadow/CONFIGURE
new file mode 100755
index 0000000..d796932
--- /dev/null
+++ b/security/shadow/CONFIGURE
@@ -0,0 +1,18 @@
+config_query SHADOW_CONV "Attempt to convert/fix accounts (with installed
shadow utils)" y &&
+if [[ "$SHADOW_CONV" == y ]]; then
+ message "OK, checking your user and group accounts" &&
+ 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"
+ }
+ 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
+# the tools give negative return even after successfully fixing stuff
+true
diff --git a/security/shadow/FINAL b/security/shadow/FINAL
index 0ab0430..eca5bd2 100755
--- a/security/shadow/FINAL
+++ b/security/shadow/FINAL
@@ -1,3 +1,6 @@
-#Create or update necessary files for shadow
-${INSTALL_ROOT}/usr/sbin/pwconv &&
-${INSTALL_ROOT}/usr/sbin/grpconv
+if [ "$SHADOW_CONV" == y ]; then
+ #Create or update necessary files for shadow
+ message "running pwconv and grpconv" &&
+ ${INSTALL_ROOT}/usr/sbin/pwconv &&
+ ${INSTALL_ROOT}/usr/sbin/grpconv
+fi
diff --git a/security/shadow/HISTORY b/security/shadow/HISTORY
index bd4348b..b129ae4 100644
--- a/security/shadow/HISTORY
+++ b/security/shadow/HISTORY
@@ -1,3 +1,7 @@
+2007-01-22 Thomas Orgis <sobukus AT sourcemage.org>
+ * CONFIGURE,FINAL: optionally check/correct the account files
+ that's final (hopefully) for bug 8834
+
2007-01-20 Thomas Orgis <sobukus AT sourcemage.org>
* pam.d/su: move that to coreutils as the su binary comes from
there now




Archive powered by MHonArc 2.6.24.

Top of Page