summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-07-10 00:08:39 +0000
committerOlivier Blin <oblin@mandriva.com>2008-07-10 00:08:39 +0000
commit8403d92b82f9f775695a3f105a2b5b38b8d1bb20 (patch)
treef983138a1ba08c626b1b9792740bc350338b326d /perl-install
parentef150e92246828bec56f64b74293a372012a5d51 (diff)
downloaddrakx-8403d92b82f9f775695a3f105a2b5b38b8d1bb20.tar
drakx-8403d92b82f9f775695a3f105a2b5b38b8d1bb20.tar.gz
drakx-8403d92b82f9f775695a3f105a2b5b38b8d1bb20.tar.bz2
drakx-8403d92b82f9f775695a3f105a2b5b38b8d1bb20.tar.xz
drakx-8403d92b82f9f775695a3f105a2b5b38b8d1bb20.zip
authentication: add back fix to force the password to be utf8 (#23273), wrongly reverted on r242842)
Diffstat (limited to 'perl-install')
-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 8c2eef189..28d70c406 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- authentication:
+ o add back fix to force the password to be utf8 (#23273)
+
Version 10.45 - 09 July 2008
- update autologin file path for kdm4
diff --git a/perl-install/authentication.pm b/perl-install/authentication.pm
index 664eb49ae..638cb7f92 100644
--- a/perl-install/authentication.pm
+++ b/perl-install/authentication.pm
@@ -815,6 +815,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 b398f0e2f..cb83be3e9 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- authentication:
+ o add back fix to force the password to be utf8 (#23273)
+
Version 10.45 - 9 July 2008
- update autologin file path for kdm4