summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-03-25 14:27:56 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-03-25 14:27:56 +0000
commit9cf328b21c1e39f6071146ad30aaf317b93882d5 (patch)
treecf698130616d960e70911412002a5fb307e2f657
parent1ceedccb6b1023339ada475c2495f9982cdd45e0 (diff)
downloaddrakx-9cf328b21c1e39f6071146ad30aaf317b93882d5.tar
drakx-9cf328b21c1e39f6071146ad30aaf317b93882d5.tar.gz
drakx-9cf328b21c1e39f6071146ad30aaf317b93882d5.tar.bz2
drakx-9cf328b21c1e39f6071146ad30aaf317b93882d5.tar.xz
drakx-9cf328b21c1e39f6071146ad30aaf317b93882d5.zip
- adduserdrake
o force the password to be utf8 (#23273) (that's what userdrake do)
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/authentication.pm3
-rw-r--r--perl-install/install/NEWS3
3 files changed, 9 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 22cc7b600..bf9319820 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- adduserdrake
+ o force the password to be utf8 (#23273)
+
Version 10.19 - 21 March 2008
- bootloader-config, drakboot:
diff --git a/perl-install/authentication.pm b/perl-install/authentication.pm
index e292639f4..c4c7d4884 100644
--- a/perl-install/authentication.pm
+++ b/perl-install/authentication.pm
@@ -720,6 +720,9 @@ sub salt {
sub user_crypted_passwd {
my ($u, $isMD5) = @_;
if ($u->{password}) {
+ require utf8;
+ utf8::encode($u->{password}); #- we don't want perl to do "smart" things in crypt()
+
crypt($u->{password}, $isMD5 ? '$1$' . salt(8) : salt(2));
} else {
$u->{pw} || '';
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index bd10a3635..f0d1ed684 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- root/user password:
+ o force the password to be utf8 (#23273)
+
Version 10.19 - 21 March 2008
- diskdrake: