summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2004-01-08 17:31:36 +0000
committerPascal Rigaux <pixel@mandriva.com>2004-01-08 17:31:36 +0000
commit6887bb46366245ba10c35d907dc6a3f206d804b1 (patch)
treeef66e7dcc4f74ebac72ed8574365e8807136e0a3 /perl-install/install_steps_interactive.pm
parent85f7d9cca33fdfb0688789e4116db9f0b1c88fa5 (diff)
downloaddrakx-6887bb46366245ba10c35d907dc6a3f206d804b1.tar
drakx-6887bb46366245ba10c35d907dc6a3f206d804b1.tar.gz
drakx-6887bb46366245ba10c35d907dc6a3f206d804b1.tar.bz2
drakx-6887bb46366245ba10c35d907dc6a3f206d804b1.tar.xz
drakx-6887bb46366245ba10c35d907dc6a3f206d804b1.zip
- integrate chkauth (which is now deprecated)
- new module authentication
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm7
1 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 9c915051f..356d2e1c1 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -1126,7 +1126,8 @@ sub setRootPassword {
$sup->{password2} ||= $sup->{password} ||= "";
if ($o->{security} >= 1 || $clicked) {
- my $authentication_kind = any::authentication2authentication_kind($o->{authentication} ||= {});
+ require authentication;
+ my $authentication_kind = authentication::to_kind($o->{authentication} ||= {});
$o->ask_from_({
title => N("Set root password and network authentication methods"),
@@ -1145,10 +1146,10 @@ sub setRootPassword {
} } }, [
{ label => N("Password"), val => \$sup->{password}, hidden => 1 },
{ label => N("Password (again)"), val => \$sup->{password2}, hidden => 1 },
-{ label => N("Authentication"), val => \$authentication_kind, list => [ any::authentication_kinds() ], format => \&any::authentication_kind2description, advanced => 1 },
+{ label => N("Authentication"), val => \$authentication_kind, list => [ authentication::kinds() ], format => \&authentication::kind2description, advanced => 1 },
]) or delete $sup->{password};
- any::ask_authentification_parameters($o, $o->{netc}, $o->{authentication}, $authentication_kind) or goto &setRootPassword;
+ authentication::ask_parameters($o, $o->{netc}, $o->{authentication}, $authentication_kind) or goto &setRootPassword;
}
install_steps::setRootPassword($o);
}