root
/
rabbitmq-server
mirror of https://github.com/rabbitmq/rabbitmq-server.git
1
0
Fork 0
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Merge branch 'stable'

This commit is contained in:
Michael Klishin 2017-05-10 21:54:53 +03:00
parent 6f487f5f5b 72a5c24ca2
commit f20f4c0193
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
deps/rabbitmq_auth_backend_ldap/Makefile vendored
View File

@ -11,6 +11,7 @@ define PROJECT_ENV
{group_lookup_base, none},
{dn_lookup_bind, as_user},
{other_bind, as_user},
{anon_auth, false},
{vhost_access_query, {constant, true}},
{resource_access_query, {constant, true}},
{topic_access_query, {constant, true}},

3
deps/rabbitmq_auth_backend_ldap/src/rabbit_auth_backend_ldap.erl vendored
View File

@ -418,7 +418,8 @@ with_ldap({error, _} = E, _Fun, _State) ->
%% of interest, so this could still be more efficient.
with_ldap({ok, Creds}, Fun, Servers) ->
Opts0 = [{port, env(port)},
{idle_timeout, env(idle_timeout)}],
{idle_timeout, env(idle_timeout)},
{anon_auth, env(anon_auth)}],
Opts1 = case env(log) of
network ->
Pre = " LDAP network traffic: ",