diff options
| author | Derek Jennings <djennings@mageia.org> | 2013-09-11 14:05:24 +0100 |
|---|---|---|
| committer | Derek Jennings <djennings@mageia.org> | 2013-09-11 14:05:24 +0100 |
| commit | 9283324cf9194232b4f2616dcbb5fa562cd21189 (patch) | |
| tree | 4dfb966e067dbca1c08f7e13ad7ada9ef4b3d382 | |
| parent | b6cf16ed11a09d8eb415b83af8533195bd7389ee (diff) | |
| download | drakx-9283324cf9194232b4f2616dcbb5fa562cd21189.tar drakx-9283324cf9194232b4f2616dcbb5fa562cd21189.tar.gz drakx-9283324cf9194232b4f2616dcbb5fa562cd21189.tar.bz2 drakx-9283324cf9194232b4f2616dcbb5fa562cd21189.tar.xz drakx-9283324cf9194232b4f2616dcbb5fa562cd21189.zip | |
drakauth: adjustments to ldap config (mga#10005)
| -rw-r--r-- | perl-install/authentication.pm | 4 |
1 files changed, 2 insertions, 2 deletions
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}, ); } |