yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: eldap lib is eldap2

This commit is contained in:
Thales Macedo Garitezi 2022-08-11 13:09:24 -03:00
parent 5d431fdd64
commit 7a20d32164
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/emqx_auth_ldap/src/emqx_acl_ldap.erl
View File

@ -19,7 +19,7 @@
-include("emqx_auth_ldap.hrl"). -include("emqx_auth_ldap.hrl").
-include_lib("emqx/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("eldap/include/eldap.hrl"). -include_lib("eldap2/include/eldap.hrl").
-include_lib("emqx/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
-export([ check_acl/5 -export([ check_acl/5

2
apps/emqx_auth_ldap/src/emqx_auth_ldap.app.src
View File

@ -1,6 +1,6 @@
{application, emqx_auth_ldap, {application, emqx_auth_ldap,
[{description, "EMQ X Authentication/ACL with LDAP"}, [{description, "EMQ X Authentication/ACL with LDAP"},
{vsn, "4.3.5"}, % strict semver, bump manually! {vsn, "4.3.6"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, [emqx_auth_ldap_sup]}, {registered, [emqx_auth_ldap_sup]},
{applications, [kernel,stdlib,eldap2,ecpool]}, {applications, [kernel,stdlib,eldap2,ecpool]},

16
apps/emqx_auth_ldap/src/emqx_auth_ldap.appup.src
View File

@ -1,8 +1,12 @@
%% -*- mode: erlang -*- %% -*- mode: erlang -*-
%% Unless you know what you are doing, DO NOT edit manually!! %% Unless you know what you are doing, DO NOT edit manually!!
{VSN, {VSN,
[{<<"4\\.3\\.[3-4]">>, [{"4.3.5",
[{load_module,emqx_auth_ldap_app,brutal_purge,soft_purge,[]}, [{load_module,emqx_auth_ldap,brutal_purge,soft_purge,[]},
{load_module,emqx_acl_ldap,brutal_purge,soft_purge,[]}]},
{<<"4\\.3\\.[3-4]">>,
[{load_module,emqx_acl_ldap,brutal_purge,soft_purge,[]},
{load_module,emqx_auth_ldap_app,brutal_purge,soft_purge,[]},
{load_module,emqx_auth_ldap,brutal_purge,soft_purge,[]}]}, {load_module,emqx_auth_ldap,brutal_purge,soft_purge,[]}]},
{"4.3.2", {"4.3.2",
[{load_module,emqx_auth_ldap_app,brutal_purge,soft_purge,[]}, [{load_module,emqx_auth_ldap_app,brutal_purge,soft_purge,[]},
@ -14,8 +18,12 @@
{load_module,emqx_acl_ldap,brutal_purge,soft_purge,[]}, {load_module,emqx_acl_ldap,brutal_purge,soft_purge,[]},
{load_module,emqx_auth_ldap_cli,brutal_purge,soft_purge,[]}]}, {load_module,emqx_auth_ldap_cli,brutal_purge,soft_purge,[]}]},
{<<".*">>,[]}], {<<".*">>,[]}],
[{<<"4\\.3\\.[3-4]">>, [{"4.3.5",
[{load_module,emqx_auth_ldap_app,brutal_purge,soft_purge,[]}, [{load_module,emqx_auth_ldap,brutal_purge,soft_purge,[]},
{load_module,emqx_acl_ldap,brutal_purge,soft_purge,[]}]},
{<<"4\\.3\\.[3-4]">>,
[{load_module,emqx_acl_ldap,brutal_purge,soft_purge,[]},
{load_module,emqx_auth_ldap_app,brutal_purge,soft_purge,[]},
{load_module,emqx_auth_ldap,brutal_purge,soft_purge,[]}]}, {load_module,emqx_auth_ldap,brutal_purge,soft_purge,[]}]},
{"4.3.2", {"4.3.2",
[{load_module,emqx_auth_ldap_app,brutal_purge,soft_purge,[]}, [{load_module,emqx_auth_ldap_app,brutal_purge,soft_purge,[]},

2
apps/emqx_auth_ldap/src/emqx_auth_ldap.erl
View File

@ -19,7 +19,7 @@
-include("emqx_auth_ldap.hrl"). -include("emqx_auth_ldap.hrl").
-include_lib("emqx/include/emqx.hrl"). -include_lib("emqx/include/emqx.hrl").
-include_lib("eldap/include/eldap.hrl"). -include_lib("eldap2/include/eldap.hrl").
-include_lib("emqx/include/logger.hrl"). -include_lib("emqx/include/logger.hrl").
-import(proplists, [get_value/2]). -import(proplists, [get_value/2]).