diff options
Diffstat (limited to 'src/ejabberd_auth_ldap.erl')
| -rw-r--r-- | src/ejabberd_auth_ldap.erl | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/src/ejabberd_auth_ldap.erl b/src/ejabberd_auth_ldap.erl index 9c490bb93..b96571366 100644 --- a/src/ejabberd_auth_ldap.erl +++ b/src/ejabberd_auth_ldap.erl @@ -66,7 +66,7 @@ servers, backups, port, - encrypt, + tls_options, dn, password, base, @@ -119,19 +119,19 @@ terminate(_Reason, _State) -> init(Host) -> State = parse_options(Host), eldap_pool:start_link(State#state.eldap_id, - State#state.servers, - State#state.backups, - State#state.port, - State#state.dn, - State#state.password, - State#state.encrypt), + State#state.servers, + State#state.backups, + State#state.port, + State#state.dn, + State#state.password, + State#state.tls_options), eldap_pool:start_link(State#state.bind_eldap_id, - State#state.servers, - State#state.backups, - State#state.port, - State#state.dn, - State#state.password, - State#state.encrypt), + State#state.servers, + State#state.backups, + State#state.port, + State#state.dn, + State#state.password, + State#state.tls_options), {ok, State}. plain_password_required() -> @@ -373,6 +373,7 @@ parse_options(Host) -> Backups -> Backups end, LDAPEncrypt = ejabberd_config:get_local_option({ldap_encrypt, Host}), + LDAPTLSVerify = ejabberd_config:get_local_option({ldap_tls_verify, Host}), LDAPPort = case ejabberd_config:get_local_option({ldap_port, Host}) of undefined -> case LDAPEncrypt of tls -> ?LDAPS_PORT; @@ -417,7 +418,8 @@ parse_options(Host) -> servers = LDAPServers, backups = LDAPBackups, port = LDAPPort, - encrypt = LDAPEncrypt, + tls_options = [{encrypt, LDAPEncrypt}, + {tls_verify, LDAPTLSVerify}], dn = RootDN, password = Password, base = LDAPBase, |