diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2010-05-10 19:37:37 +1000 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2010-05-10 19:37:37 +1000 |
| commit | f58d03c12e1160f40a7c38b61b0b6a47a1bc6a1b (patch) | |
| tree | 3efc5d340d385a2660c1c6b69a3445f2d8c46264 /src/mod_vcard_ldap.erl | |
| parent | full support for XEP-0115 v1.5 (EJAB-1223) (EJAB-1189) (diff) | |
new option ldap_tls_verify is added (EJAB-1229)
Diffstat (limited to '')
| -rw-r--r-- | src/mod_vcard_ldap.erl | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/mod_vcard_ldap.erl b/src/mod_vcard_ldap.erl index f4078dfc4..ed52a0593 100644 --- a/src/mod_vcard_ldap.erl +++ b/src/mod_vcard_ldap.erl @@ -62,7 +62,7 @@ servers, backups, port, - encrypt, + tls_options, dn, base, password, @@ -181,7 +181,7 @@ init([Host, Opts]) -> State#state.port, State#state.dn, State#state.password, - State#state.encrypt), + State#state.tls_options), case State#state.search of true -> ejabberd_router:register_route(State#state.myhost); @@ -686,6 +686,11 @@ parse_options(Host, Opts) -> ejabberd_config:get_local_option({ldap_encrypt, Host}); E -> E end, + LDAPTLSVerify = case gen_mod:get_opt(ldap_tls_verify, Opts, undefined) of + undefined -> + ejabberd_config:get_local_option({ldap_tls_verify, Host}); + Verify -> Verify + end, LDAPPortTemp = case gen_mod:get_opt(ldap_port, Opts, undefined) of undefined -> ejabberd_config:get_local_option({ldap_port, Host}); @@ -766,7 +771,8 @@ parse_options(Host, Opts) -> servers = LDAPServers, backups = LDAPBackups, port = LDAPPort, - encrypt = LDAPEncrypt, + tls_options = [{encrypt, LDAPEncrypt}, + {tls_verify, LDAPTLSVerify}], dn = RootDN, base = LDAPBase, password = Password, |