Merge pull request #3647 from esl/eldap-fix

Remove custom eldap.hrl
esl · May 13, 2022 · 74bf246 · 74bf246
2 parents adf8001 + f39a1c9
commit 74bf246
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 52 deletions.
diff --git a/include/eldap.hrl b/include/eldap.hrl
diff --git a/src/auth/ejabberd_auth_ldap.erl b/src/auth/ejabberd_auth_ldap.erl
@@ -56,7 +56,7 @@
 -ignore_xref([start_link/1]).
 
 -include("mongoose_config_spec.hrl").
--include("eldap.hrl").
+-include_lib("eldap/include/eldap.hrl").
 
 -record(state,
        {host_type              :: mongooseim:host_type(),

diff --git a/src/eldap_pool.erl b/src/eldap_pool.erl
@@ -30,8 +30,7 @@
 %% API
 -export([bind/3, search/2, delete/2, add/3, modify_passwd/3]).
 -import(eldap_utils, [maybe_b2list/1]).
--include("mongoose.hrl").
--include("eldap.hrl").
+-include_lib("eldap/include/eldap.hrl").
 
 %%====================================================================
 %% API

diff --git a/src/eldap_utils.erl b/src/eldap_utils.erl
@@ -45,9 +45,6 @@
 
 -ignore_xref([decode_octet_string/3, generate_subfilter/1, make_filter/2, uids_domain_subst/2]).
 
--include("mongoose.hrl").
--include("eldap.hrl").
-
 -type dn() :: binary().
 -type deref() :: neverDerefAliases | derefInSearching
                  | derefFindingBaseObj | derefAlways.

diff --git a/src/mod_shared_roster_ldap.erl b/src/mod_shared_roster_ldap.erl
@@ -46,12 +46,10 @@
 -ignore_xref([config_change/4, get_jid_info/4, get_subscription_lists/2, get_user_roster/2,
               in_subscription/5, out_subscription/4, process_item/2, start_link/2]).
 
--include("mongoose.hrl").
 -include("jlib.hrl").
 -include("mod_roster.hrl").
 -include("mongoose_config_spec.hrl").
-
--include("eldap.hrl").
+-include_lib("eldap/include/eldap.hrl").
 
 -define(CACHE_SIZE, 1000).
 

diff --git a/src/mongoose_ldap_worker.erl b/src/mongoose_ldap_worker.erl
@@ -11,7 +11,6 @@
          code_change/3]).
 
 -include("mongoose.hrl").
--include("eldap.hrl").
 
 -type state() :: #{handle := none | eldap:handle(),
                    servers := [string()],

diff --git a/src/vcard/mod_vcard_ldap.erl b/src/vcard/mod_vcard_ldap.erl
@@ -42,7 +42,7 @@
          default_search_fields/0,
          default_search_reported/0]).
 
--include("eldap.hrl").
+-include_lib("eldap/include/eldap.hrl").
 -include("mod_vcard.hrl").
 -include("jlib.hrl").