diff options
| author | Mark Felder <feld@feld.me> | 2024-09-17 13:07:26 -0400 |
|---|---|---|
| committer | Mark Felder <feld@feld.me> | 2024-09-17 13:40:15 -0400 |
| commit | 123093a1868b25f101dfc4b02895c22a0daf5733 (patch) | |
| tree | fded85fb7b560dae6c1708de86bc31ca784ae3e9 /lib | |
| parent | 65a7b387c35b4913b6109692a84bae80af8b9a96 (diff) | |
| download | pleroma-123093a1868b25f101dfc4b02895c22a0daf5733.tar.gz pleroma-123093a1868b25f101dfc4b02895c22a0daf5733.zip | |
Ensure :ssl is started before we attempt to make the LDAP connection
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/ldap.ex | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/lib/pleroma/ldap.ex b/lib/pleroma/ldap.ex index ac819613e..042a4daa2 100644 --- 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, |