[Pkg-shadow-commits] r648 - trunk/debian

[Christian Perrier]

Author: bubulle
Date: 2005-11-10 14:46:40 +0000 (Thu, 10 Nov 2005)
New Revision: 648

Modified:
   trunk/debian/changelog
   trunk/debian/passwd.config
Log:
Properly re-prompt for root passwords when they mismatch


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-11-08 07:46:57 UTC (rev 647)
+++ trunk/debian/changelog	2005-11-10 14:46:40 UTC (rev 648)
@@ -1,6 +1,11 @@
 shadow (1:4.0.13-6) UNRELEASED; urgency=low
 
   * The "Saint-Nectaire" release
+  * Debian packaging fixes:
+    - passwd.config:
+      Add "seen false" for passwd/root-password and
+      passwd/root-password-again when entered root passwords mismatch or are
+      empty. Thanks to Tollef Fog Heen for noticing.
   * Debconf translation updates:
     - Simplified Chinese updated. Closes: #338075
 

Modified: trunk/debian/passwd.config
===================================================================
--- trunk/debian/passwd.config	2005-11-08 07:46:57 UTC (rev 647)
+++ trunk/debian/passwd.config	2005-11-10 14:46:40 UTC (rev 648)
@@ -161,6 +161,8 @@
 			    if [ -z "$ROOT_PW" ]; then
 				db_fset passwd/password-empty seen false
 				db_input critical passwd/password-empty
+				db_fset passwd/root-password seen false
+				db_fset passwd/root-password-again seen false
 				STATE=2
 				continue
 			    fi
@@ -168,6 +170,8 @@
 			    if [ "$COMPARE_PW" ] && [ "$ROOT_PW" != "$RET" ]; then
 				db_fset passwd/password-mismatch seen false
 				db_input critical passwd/password-mismatch
+				db_fset passwd/root-password seen false
+				db_fset passwd/root-password-again seen false
 				STATE=2
 				continue
 			    fi