[Pkg-shadow-commits] r506 - branches/experimental/debian
Christian Perrier
bubulle at costa.debian.org
Thu Sep 1 09:43:17 UTC 2005
Author: bubulle
Date: 2005-09-01 09:43:17 +0000 (Thu, 01 Sep 2005)
New Revision: 506
Modified:
branches/experimental/debian/changelog
branches/experimental/debian/passwd.config
Log:
Fix the endless loop when the entered passwords for the normal user mismatch
Modified: branches/experimental/debian/changelog
===================================================================
--- branches/experimental/debian/changelog 2005-09-01 08:35:08 UTC (rev 505)
+++ branches/experimental/debian/changelog 2005-09-01 09:43:17 UTC (rev 506)
@@ -25,6 +25,9 @@
pam_rootok.so alone
- use dh_installpam to install PAM configuration files
- start the cleanup of the unused patches list
+ - debian/passwd.config:
+ No more endless loops when the user passwords mismatch
+ Closes: #325910
* Upstream bugs not already fixed in upstream releases or CVS:
- 443_chage_exit_values: now exit with errorlevel=15 when no
shadow password exists (was previously 3 but upstream now uses it)
Modified: branches/experimental/debian/passwd.config
===================================================================
--- branches/experimental/debian/passwd.config 2005-09-01 08:35:08 UTC (rev 505)
+++ branches/experimental/debian/passwd.config 2005-09-01 09:43:17 UTC (rev 506)
@@ -98,7 +98,7 @@
# Main loop starts here. Use a state machine to allow jumping back to
# previous questions.
STATE=0
-while [ "$STATE" != '9' ] && [ "$STATE" != '-1' ]; do
+while [ "$STATE" != '10' ] && [ "$STATE" != '-1' ]; do
case "$STATE" in
0)
# Ask how the password files should be set up.
@@ -200,10 +200,6 @@
fi
fi
db_input critical passwd/username || true
- db_input critical passwd/user-password || true
- COMPARE_PW=''
- db_input critical passwd/user-password-again \
- && COMPARE_PW=1 || true
fi
;;
8)
@@ -221,6 +217,15 @@
continue
fi
+ db_input critical passwd/user-password || true
+ COMPARE_PW=''
+ db_input critical passwd/user-password-again \
+ && COMPARE_PW=1 || true
+ fi
+ ;;
+ 9)
+ db_get passwd/make-user
+ if [ "$RET" = true ] && ! is_system_user; then
# Compare the two passwords, loop with message if not
# identical, or if empty.
db_get passwd/user-password
More information about the Pkg-shadow-commits
mailing list