aboutsummaryrefslogtreecommitdiff
path: root/src/mod_vcard_ldap.erl
diff options
context:
space:
mode:
Diffstat (limited to 'src/mod_vcard_ldap.erl')
-rw-r--r--src/mod_vcard_ldap.erl15
1 files changed, 14 insertions, 1 deletions
diff --git a/src/mod_vcard_ldap.erl b/src/mod_vcard_ldap.erl
index 7afd1f210..56ba9eb4d 100644
--- a/src/mod_vcard_ldap.erl
+++ b/src/mod_vcard_ldap.erl
@@ -691,6 +691,17 @@ parse_options(Host, Opts) ->
ejabberd_config:get_local_option({ldap_tls_verify, Host});
Verify -> Verify
end,
+ LDAPTLSCAFile = case gen_mod:get_opt(ldap_tls_cacertfile, Opts, undefined) of
+ undefined ->
+ ejabberd_config:get_local_option({ldap_tls_cacertfile, Host});
+ CAFile -> CAFile
+ end,
+ LDAPTLSDepth = case gen_mod:get_opt(ldap_tls_depth, Opts, undefined) of
+ undefined ->
+ ejabberd_config:get_local_option({ldap_tls_depth, Host});
+ Depth ->
+ Depth
+ end,
LDAPPortTemp = case gen_mod:get_opt(ldap_port, Opts, undefined) of
undefined ->
ejabberd_config:get_local_option({ldap_port, Host});
@@ -776,7 +787,9 @@ parse_options(Host, Opts) ->
backups = LDAPBackups,
port = LDAPPort,
tls_options = [{encrypt, LDAPEncrypt},
- {tls_verify, LDAPTLSVerify}],
+ {tls_verify, LDAPTLSVerify},
+ {tls_cacertfile, LDAPTLSCAFile},
+ {tls_depth, LDAPTLSDepth}],
dn = RootDN,
base = LDAPBase,
password = Password,