mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-11-13 12:31:13 +00:00
Code Issues Projects Releases Wiki Activity

Ensure :ssl is started before we attempt to make the LDAP connection

Browse source
This commit is contained in:
Mark Felder 2024-09-17 13:07:26 -04:00
parent 65a7b387c3
commit 123093a186
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/pleroma/ldap.ex
View file

@ -97,6 +97,8 @@ defmodule Pleroma.LDAP do
tls = Keyword.get(ldap, :tls, false) tls = Keyword.get(ldap, :tls, false)
cacertfile = Keyword.get(ldap, :cacertfile) || CAStore.file_path() cacertfile = Keyword.get(ldap, :cacertfile) || CAStore.file_path()
if ssl, do: Application.ensure_all_started(:ssl)
default_secure_opts = [ default_secure_opts = [
verify: :verify_peer, verify: :verify_peer,
cacerts: decode_certfile(cacertfile), cacerts: decode_certfile(cacertfile),
@ -123,10 +125,6 @@ defmodule Pleroma.LDAP do
{:ok, connection} -> {:ok, connection} ->
try do try do
cond do cond do
ssl ->
:application.ensure_all_started(:ssl)
{:ok, connection}
tls -> tls ->
case :eldap.start_tls( case :eldap.start_tls(
connection, connection,