From 23c42785adc0e88380c6a1ee454586f8e366e3db Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 2 Dec 2004 08:27:36 +0000
Subject: move crypt() where it's needed

---
 perl-install/any.pm            | 4 ----
 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} || '';
-- 
cgit v1.2.1