logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma git clone https://hacktivis.me/git/pleroma.git
commit: 123093a1868b25f101dfc4b02895c22a0daf5733
parent 65a7b387c35b4913b6109692a84bae80af8b9a96
Author: Mark Felder <feld@feld.me>
Date:   Tue, 17 Sep 2024 13:07:26 -0400

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

Diffstat:

Mlib/pleroma/ldap.ex6++----
1 file changed, 2 insertions(+), 4 deletions(-)

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