From ea0092057431b186c8bfe5212cb65b5f73ca7629 Mon Sep 17 00:00:00 2001 From: Vicent Guardiola Date: Fri, 2 Jul 2004 02:35:15 +0000 Subject: Change SSL/TLS to SSL or TLS add uc_domain to realm section in /etc/krb5.conf padbol --- perl-install/authentication.pm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'perl-install/authentication.pm') diff --git a/perl-install/authentication.pm b/perl-install/authentication.pm index e764d669c..df2f9457b 100644 --- a/perl-install/authentication.pm +++ b/perl-install/authentication.pm @@ -47,7 +47,8 @@ sub ask_parameters { my %sub_kinds = my @sub_kinds = ( anonymous => N("anonymous"), simple => N("simple"), - tls => N("over SSL/TLS"), + tls => N("TLS"), + ssl => N("SSL"), kerberos => N("security layout (SASL/Kerberos)"), ); my $AD_user = $authentication->{AD_user} =~ /(.*)\@\Q$val\E$/ ? $1 : $authentication->{AD_user}; @@ -125,8 +126,9 @@ sub set { my $ssl = { anonymous => 'off', simple => 'off', - tls => 'start_tls' . "\n" . 'ssl on', - kerberos => 'on', + tls => 'start_tls', + ssl => 'on', + kerberos => 'off', }->{$authentication->{sub_kind}}; update_ldap_conf( @@ -346,7 +348,7 @@ sub configure_krb5_for_AD { my @sections = ( realms => <{AD_server}:88 admin_server = $authentication->{AD_server}:749 default_domain = $authentication->{AD} -- cgit v1.2.1