From 9283324cf9194232b4f2616dcbb5fa562cd21189 Mon Sep 17 00:00:00 2001 From: Derek Jennings Date: Wed, 11 Sep 2013 14:05:24 +0100 Subject: drakauth: adjustments to ldap config (mga#10005) --- perl-install/authentication.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'perl-install') diff --git a/perl-install/authentication.pm b/perl-install/authentication.pm index fd44bb22c..ea45feab7 100644 --- a/perl-install/authentication.pm +++ b/perl-install/authentication.pm @@ -897,7 +897,7 @@ sub fetch_dn { sub configure_nss_ldap { my ($authentication) = @_; update_ldap_conf( - uri => "ldaps://" . $authentication->{LDAP_server} . "/", + uri => $authentication->{cafile} eq '1' ? "ldaps://" . $authentication->{LDAP_server} . "/" : "ldap://" . $authentication->{LDAP_server} . "/", base => $authentication->{LDAPDOMAIN}, ); @@ -928,7 +928,7 @@ sub configure_nss_ldap { if ($authentication->{cafile} eq '1') { update_ldap_conf( ssl => "on", - tls_reqcert => "demand", + tls_reqcert => "allow", tls_cacertfile => $authentication->{file}, ); } -- cgit v1.2.1