diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-12-02 08:27:36 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-12-02 08:27:36 +0000 |
| commit | 23c42785adc0e88380c6a1ee454586f8e366e3db (patch) | |
| tree | fdb97364e824a2b0c312f7b7110b887c43401589 | |
| parent | d57bb012ffed94d2a4912d0d4a896e60a259f739 (diff) | |
| download | drakx-backup-do-not-use-23c42785adc0e88380c6a1ee454586f8e366e3db.tar drakx-backup-do-not-use-23c42785adc0e88380c6a1ee454586f8e366e3db.tar.gz drakx-backup-do-not-use-23c42785adc0e88380c6a1ee454586f8e366e3db.tar.bz2 drakx-backup-do-not-use-23c42785adc0e88380c6a1ee454586f8e366e3db.tar.xz drakx-backup-do-not-use-23c42785adc0e88380c6a1ee454586f8e366e3db.zip | |
move crypt() where it's needed
| -rw-r--r-- | perl-install/any.pm | 4 | ||||
| -rw-r--r-- | perl-install/authentication.pm | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index a679ad0af..73152b012 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -100,10 +100,6 @@ sub add_users { } } -sub crypt { - my ($password, $md5) = @_; - crypt($password, $md5 ? '$1$' . salt(8) : salt(2)); -} sub enableShadow() { run_program::rooted($::prefix, "pwconv") or log::l("pwconv failed"); run_program::rooted($::prefix, "grpconv") or log::l("grpconv failed"); diff --git a/perl-install/authentication.pm b/perl-install/authentication.pm index 9994de0ad..f7c5dc2ee 100644 --- a/perl-install/authentication.pm +++ b/perl-install/authentication.pm @@ -574,6 +574,11 @@ sub query_srv_names { map { $_->target } $query->answer; } +sub crypt { + my ($password, $md5) = @_; + crypt($password, $md5 ? '$1$' . salt(8) : salt(2)); +} + sub user_crypted_passwd { my ($u, $isMD5) = @_; $u->{password} ? &crypt($u->{password}, $isMD5) : $u->{pw} || ''; |