From 6a3d1dbded7b49efe5001a4766c956336521b5a6 Mon Sep 17 00:00:00 2001
From: DrakeDiedrich <DrakeDiedrich@0b4bb1d4-4e5a-0410-9cc4-b2b747904278>
Date: Sun, 20 Sep 2009 21:04:57 +0000
Subject: [PATCH] Item2105: Make password questions less complex and frequent.

git-svn-id: http://svn.foswiki.org/branches/Release01x00@5056 0b4bb1d4-4e5a-0410-9cc4-b2b747904278
---
 core/tools/pkg/debian/config   | 40 +++-------------------------------
 core/tools/pkg/debian/postinst |  4 ----
 2 files changed, 3 insertions(+), 41 deletions(-)

diff --git a/core/tools/pkg/debian/config b/core/tools/pkg/debian/config
index 56a9a83d5f..0a567684f4 100644
--- a/core/tools/pkg/debian/config
+++ b/core/tools/pkg/debian/config
@@ -29,44 +29,10 @@ if [ "$RET" = "false" ]; then
     db_get foswiki/adminuser
     configuser="$RET"
     db_subst "foswiki/adminpassword" "configuser" "$configuser"
-    db_subst "foswiki/adminpassword_again" "configuser" "$configuser"
-
-    pass_ok="false"
-    while [ "$pass_ok" != "true" ]; do
-        # Ask for password
-        # high : password must be typed-in
-	db_input high foswiki/adminpassword || [ $? -eq 30 ]
-
-        # Ask for password again
-	db_input high foswiki/adminpassword_again || [ $? -eq 30 ]
-	db_go
-
-	db_get foswiki/adminpassword
-	password="$RET"
-	db_get foswiki/adminpassword_again
-	password_again="$RET"
-
-        # If password are not equals, loop again
-	if [ "$password" != "$password_again" ]; then
-
-	    # Reset the template used.
-	    db_reset "foswiki/adminpassword" || true
-	    db_fset  "foswiki/adminpassword" "seen" "false" || true
-	    db_reset "foswiki/adminpassword_again" || true
-	    db_fset  "foswiki/adminpassword_again" "seen" "false" || true
-	    # Promt the user.
-	    db_input critical "foswiki/password_mismatch" || true
-
-	    # Loop again
-	    continue
-	fi
-
-	pass_ok="true"
-
-        # attention, password is seen, but reset, so next time, must not compare again
-	db_reset foswiki/adminpassword_again
-    done
 
+    # Ask for password
+    # high : password must be typed-in
+    db_input high foswiki/adminpassword || [ $? -eq 30 ]
 fi
 
 # add info due to 3-4 bug reports
diff --git a/core/tools/pkg/debian/postinst b/core/tools/pkg/debian/postinst
index cea8c27bc8..970f227951 100644
--- a/core/tools/pkg/debian/postinst
+++ b/core/tools/pkg/debian/postinst
@@ -174,10 +174,6 @@ case "$1" in
 	chown -R $WIKI_OWNER.www-data /var/lib/foswiki/templates
 	chown -R $WIKI_OWNER.www-data /var/lib/foswiki/tools
 
-	# erase configuser password
-        db_reset "foswiki/adminpassword"
-	db_fset  "foswiki/adminpassword" "seen" "false" || true
-
 	db_stop