summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVicent Guardiola <vguardiola@mandriva.com>2004-10-28 11:29:02 +0000
committerVicent Guardiola <vguardiola@mandriva.com>2004-10-28 11:29:02 +0000
commit8e3314618db296cbc9785a65349a5deb4f683533 (patch)
treef1d470df42e71d48d139aed4dd6239d6cca60dbc
parent0a04b17e1e866fd33c0071809fe2a99991f662e7 (diff)
downloaddrakx-8e3314618db296cbc9785a65349a5deb4f683533.tar
drakx-8e3314618db296cbc9785a65349a5deb4f683533.tar.gz
drakx-8e3314618db296cbc9785a65349a5deb4f683533.tar.bz2
drakx-8e3314618db296cbc9785a65349a5deb4f683533.tar.xz
drakx-8e3314618db296cbc9785a65349a5deb4f683533.zip
remove idmap from winbind AD
change description for Active directory
-rw-r--r--perl-install/authentication.pm14
1 files changed, 5 insertions, 9 deletions
diff --git a/perl-install/authentication.pm b/perl-install/authentication.pm
index 0ee66a6b5..a50032fe3 100644
--- a/perl-install/authentication.pm
+++ b/perl-install/authentication.pm
@@ -28,8 +28,8 @@ sub kind2description() {
[ 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.") ],
+ [ N("Active Directory with SFU:"), N("Allows a system to retreive user information from Active Directory with SFU installed"), ],
+ [ N("Active Directory with Winbind:"), N("Allows a system to retreive user information from Active Directory.") ],
)
);
}
@@ -84,7 +84,7 @@ sub ask_parameters {
N("Authentication Active Directory")."\n",
[
{ label => N("Use anomymous bind"), val => \$authentication->{anonymous}, type => 'bool',"\n\n" },
- { label => N("User allowed to Bind Active Directory"), val => \$AD_user, disabled => sub { $authentication->{anonymous} } },
+ { label => N("User allowed to bind Active Directory"), val => \$AD_user, disabled => sub { $authentication->{anonymous} } },
{ label => N("Password for user"), val => \$authentication->{AD_password},hidden => 1, disabled => sub { $authentication->{anonymous} }},
{ label => N("Enable TLS"), val => \$authentication->{tls}, type => 'bool'},
{ label => "\n".N("Domain"), val => \$authentication->{AD_domain} },
@@ -121,15 +121,11 @@ The command 'wbinfo -t' will test whether your authentication secrets are good."
$in->ask_from('',
$kind eq 'SMBKRB' ? N("Authentication Active Directory") : N("Authentication Windows Domain"),
[ if_($kind eq 'SMBKRB',
- { label => N("Domain"), val => \$authentication->{AD_domain} }
+ { label => N("Active Directory Tree"), val => \$authentication->{AD_domain} }
),
{ label => N("Windows Domain"), val => \$netc->{WINDOMAIN} },
{ label => N("Domain Admin User Name"), val => \$authentication->{winuser} },
{ label => N("Domain Admin Password"), val => \$authentication->{winpass}, hidden => 1 },
- { label => N("Use Idmap for store UID/SID "), val => \$anonymous, type => 'bool' },
- { label => "\t".N("Default Idmap "), val => \$authentication->{AD_users_idmap}, disabled => sub { $anonymous } },
- { label => "\t".N("Administrateur"), val => \$authentication->{AD_users_idmap_adm}, disabled => sub { $anonymous } },
- { label => "\t".N("Password"), val => \$authentication->{AD_users_idmap_passwd}, disabled => sub { $anonymous } },
]) or return;
}
$authentication->{$kind} ||= 1;
@@ -260,7 +256,7 @@ sub set {
run_program::rooted($::prefix, 'net', 'join', $domain, '-U', $authentication->{winuser} . '%' . $authentication->{winpass});
});
} elsif ($kind eq 'SMBKRB') {
- $authentication->{AD_server} ||= 'ads.' . $authentication->{AD_domain};
+ $authentication->{AD_server} ||= $authentication->{AD_domain};
my $domain = uc $netc->{WINDOMAIN};
my $realm = $authentication->{AD_domain};