[Pkg-shadow-commits] r641 - trunk/debian
Christian Perrier
bubulle at costa.debian.org
Thu Nov 3 07:34:46 UTC 2005
Author: bubulle
Date: 2005-11-03 07:34:45 +0000 (Thu, 03 Nov 2005)
New Revision: 641
Modified:
trunk/debian/changelog
trunk/debian/passwd.config
Log:
Fix a logic error in the script for handled crypted passwords preseeding
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-11-02 19:25:32 UTC (rev 640)
+++ trunk/debian/changelog 2005-11-03 07:34:45 UTC (rev 641)
@@ -4,7 +4,7 @@
* Debian packaging fixes:
- passwd.config:
Add a variable quoting which probably prevented users to
- preseed a locked password for root
+ preseed a locked password for root and fix a logic error in the script
Working user password crypted preseeding (it probably failed earlier)
-- Christian Perrier <bubulle at debian.org> Tue, 1 Nov 2005 18:10:30 +0100
Modified: trunk/debian/passwd.config
===================================================================
--- trunk/debian/passwd.config 2005-11-02 19:25:32 UTC (rev 640)
+++ trunk/debian/passwd.config 2005-11-03 07:34:45 UTC (rev 641)
@@ -179,10 +179,10 @@
setpassword root "$ROOT_PW" false
ROOT_PW=''
else
+ ROOT_PW="$RET"
# The root password was preseeded encrypted
# Clear it from the db, then set it
db_set passwd/root-password-crypted ""
- ROOT_PW="$RET"
setpassword root "$ROOT_PW" true
ROOT_PW=''
fi
@@ -319,7 +319,11 @@
setpassword "$USER" "$USER_PW" false
USER_PW=''
else
- setpassword "$USER" "$RET" true
+ USER_PW="$RET"
+ # The user password was preseeded encrypted
+ # Clear it from the db, then set it
+ db_set passwd/root-password-crypted ""
+ setpassword "$USER" "$USER_PW" true
USER_PW=''
fi
More information about the Pkg-shadow-commits
mailing list