summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-07-20 09:23:32 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-07-20 09:23:32 +0000
commit1519afa63e057ab0260a7aebecf2abe8783ed799 (patch)
tree462ca18c59fa1c6c0cb4480aaf138f12417e5ee2 /perl-install
parent7b37b87982e2e55fcd18dfdf116f46bbc4a0b833 (diff)
downloaddrakx-1519afa63e057ab0260a7aebecf2abe8783ed799.tar
drakx-1519afa63e057ab0260a7aebecf2abe8783ed799.tar.gz
drakx-1519afa63e057ab0260a7aebecf2abe8783ed799.tar.bz2
drakx-1519afa63e057ab0260a7aebecf2abe8783ed799.tar.xz
drakx-1519afa63e057ab0260a7aebecf2abe8783ed799.zip
better looking wizard
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/authentication.pm32
-rwxr-xr-xperl-install/standalone/drakauth4
2 files changed, 27 insertions, 9 deletions
diff --git a/perl-install/authentication.pm b/perl-install/authentication.pm
index 5e695821f..423af56dd 100644
--- a/perl-install/authentication.pm
+++ b/perl-install/authentication.pm
@@ -7,14 +7,32 @@ use any;
sub kinds() {
('local', 'LDAP', 'NIS', 'winbind', 'AD', 'ADWIN');
}
-sub kind2description {
+
+sub kind2name {
my ($kind) = @_;
- ${{ local => N("Local file\nUse local for all authentication and information user tell in local file\n"),
- LDAP => N("LDAP\nTells your computer to use LDAP for some or all authentication.\nLDAP consolidates certain types of information within your organization.\n"),
- NIS => N("NIS\nAllows you to run a group of computers in the same Network\nInformation Service domain with a common password and group file.\n"),
- winbind => N("Windows Domain\nWinbind allows a system to retrieve information about\nusers and to authenticate users by using in an Windows domain.\n "),
- AD => N("Active Directory with SFU\nKerberos is a secure system for providing network authentication services.\n"),
- ADWIN => N("Active Directory with Winbind\nKerberos is a secure system for providing network authentication services.\n") }}{$kind};
+ # Keep the following strings in sync with kind2description ones!!!
+ ${{ local => N("Local file"),
+ LDAP => N("LDAP"),
+ NIS => N("NIS"),
+ winbind => N("Windows Domain"),
+ AD => N("Active Directory with SFU"),
+ ADWIN => N("Active Directory with Winbind") }}{$kind};
+}
+
+sub kind2description() {
+ join('',
+ map {
+ qq($_->[0]\n$_->[1]\n\n)
+ }
+ (
+ [ N("Local file:"), N("Use local for all authentication and information user tell in local file"), ],
+ [ N("LDAP:"), N("Tells your computer to use LDAP for some or all authentication. LDAP consolidates certain types of information within your organization."), ],
+ [ N("NIS:"), N("Allows you to run a group of computers in the same Network Information Service domain with a common password and group file."), ],
+ [ N("Windows Domain:"), N("Winbind allows a system to retrieve information about users and to authenticate users by using in an Windows domain."), ],
+ [ N("Active Directory with SFU:"), N("Kerberos is a secure system for providing network authentication services."), ],
+ [ N("Active Directory with Winbind:"), N("Kerberos is a secure system for providing network authentication services.") ],
+ )
+ );
}
sub to_kind {
my ($authentication) = @_;
diff --git a/perl-install/standalone/drakauth b/perl-install/standalone/drakauth
index 9006d01a6..d12d1e1ec 100755
--- a/perl-install/standalone/drakauth
+++ b/perl-install/standalone/drakauth
@@ -21,9 +21,9 @@ my $authentication = {}; # TODO
my $kind = authentication::to_kind($authentication);
main:
-$in->ask_from(N("Authentication"), join('', map { authentication::kind2description($_) } authentication::kinds()),
+$in->ask_from(N("Authentication"), authentication::kind2description($_),
[
- { label => N("Authentication"), val => \$kind, type => 'list' , list => [ authentication::kinds() ] },
+ { label => N("Authentication"), val => \$kind, type => 'list' , list => [ authentication::kinds() ], format => \&authentication::kind2name },
]) or $in->exit;
authentication::ask_parameters($in, $netc, $authentication, $kind) or goto main;