Skip to Content.
Sympa Menu

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

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 (c1c80ea7bc726fa08198d379e473ce8faafbb749)
  • Date: Wed, 7 Feb 2007 04:28:39 -0600

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

security/shadow/CONFIGURE | 22 +++++++++-------------
security/shadow/FINAL | 8 +++++---
security/shadow/HISTORY | 5 +++++
3 files changed, 19 insertions(+), 16 deletions(-)

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

shadow: making the query about restoring shadows an extra one-timer, as
Jeremy suggested

diff --git a/security/shadow/CONFIGURE b/security/shadow/CONFIGURE
index b5e0ef1..2c754b2 100755
--- a/security/shadow/CONFIGURE
+++ b/security/shadow/CONFIGURE
@@ -1,23 +1,19 @@
# There's a bug introduced by the solution of bug 8834:
# if you said "n" to $SHADOW_CONV, you ended up with the state pw/grpunconv
# left on dispelling old shadow.
-# Introducing a new var $SHADOW_NEWCONV for the query to be able to re-ask
-# the question.
+# Introducing the temporary SHADOW_RECONV to support fixing that situation.

-conv_default=n &&
-if [[ "$SHADOW_CONV" == "y" ]]; then conv_default=y; fi &&
-# if we haven't yet an answer on the new question and the old answer was not
y
-if [[ -z "$SHADOW_NEWCONV" ]] && [[ $conv_default == n ]]; then
- message "Checking passwd for shadowness (there could have been an unwanted
run of pwunconv/grpunconv)." &&
+if [[ "$SHADOW_CONV" == n ]] && [[ -z "$SHADOW_RECONV" ]]; then
+ message "Checking passwd for shadowness (there could have been an unwanted
run of pwunconv/grpunconv, see bug #8834)." &&
if ! grep -q '^root:x:' "$INSTALL_ROOT/etc/passwd"; then
- message "Your passwd file contains password hashes, suggesting
(re)conversion to shadow." &&
- message "You can still say n to the upcoming query but make sure
then to run pwconv / grpconv yourself if you want existing passwords
shadowed." &&
- conv_default=y
+ message "${PROBLEM_COLOR}Your passwd file contains password hashes,
resuggesting conversion to shadow." &&
+ message "${MESSAGE_COLOR}You can still say n to the upcoming query but
make sure to run pwconv / grpconv yourself if you want existing passwords
shadowed." &&
+ config_query SHADOW_RECONV "One-time query: convert/fix accounts (with
installed shadow utils) this time" n
fi
+else
+ config_query SHADOW_CONV "Attempt to convert/fix accounts (with installed
shadow utils)" n
fi &&
-
-config_query SHADOW_NEWCONV "Attempt to convert/fix accounts (with installed
shadow utils)" $conv_default &&
-if [[ "$SHADOW_NEWCONV" == y ]]; then
+if [[ "$SHADOW_CONV" == y ]] || [[ "$SHADOW_RECONV" == y ]]; then
message "OK, checking your user and group accounts" &&
grpck -r "$INSTALL_ROOT/etc/group" "$INSTALL_ROOT/etc/gshadow" ||
{
diff --git a/security/shadow/FINAL b/security/shadow/FINAL
index 05402f7..87461c7 100755
--- a/security/shadow/FINAL
+++ b/security/shadow/FINAL
@@ -1,6 +1,8 @@
-if [ "$SHADOW_NEWCONV" == y ]; then
+if [ "$SHADOW_CONV" == y ] || [ "$SHADOW_RECONV" == "y" ]; then
#Create or update necessary files for shadow
- message "running pwconv and grpconv" &&
+ message "${MESSAGE_COLOR}running pwconv and grpconv" &&
${INSTALL_ROOT}/usr/sbin/pwconv &&
${INSTALL_ROOT}/usr/sbin/grpconv
-fi
+fi &&
+# mark it off
+SHADOW_RECONV=x
diff --git a/security/shadow/HISTORY b/security/shadow/HISTORY
index 54989a3..fea9dcb 100644
--- a/security/shadow/HISTORY
+++ b/security/shadow/HISTORY
@@ -1,3 +1,8 @@
+2007-02-07 Thomas Orgis <sobukus AT sourcemage.org>
+ * CONFIGURE,FINAL: integrated Jeremy's suggestion of making the
+ emergency query a one-timer
+ * DETAILS: patchlevel (security level is the same as before)
+
2007-02-06 Thomas Orgis <sobukus AT sourcemage.org>
* CONFIGURE,PRE_REMOVE, REPAIR^...^PRE_REMOVE, FINAL: I made the
pwconv
optional, but there still was unconditional pwunconv in



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (c1c80ea7bc726fa08198d379e473ce8faafbb749), Thomas Orgis, 02/07/2007

Archive powered by MHonArc 2.6.24.

Top of Page