diff options
| author | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2011-07-13 15:40:27 +1000 |
|---|---|---|
| committer | Evgeniy Khramtsov <ekhramtsov@process-one.net> | 2011-07-13 15:40:27 +1000 |
| commit | 7e14b2d46a2209afcd5d17b363ffb541466618ed (patch) | |
| tree | dfc722bb309d76b4f62489bfded58460827fb449 /src/mod_shared_roster_ldap.erl | |
| parent | Room option to ignore private messages from visitors (thanks to Maxim Ignatenko) (diff) | |
Add ldap_tls_cacertfile and ldap_tls_depth options (EJAB-1299)
Diffstat (limited to 'src/mod_shared_roster_ldap.erl')
| -rw-r--r-- | src/mod_shared_roster_ldap.erl | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/mod_shared_roster_ldap.erl b/src/mod_shared_roster_ldap.erl index 613371922..0e1143d4a 100644 --- a/src/mod_shared_roster_ldap.erl +++ b/src/mod_shared_roster_ldap.erl @@ -483,6 +483,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, LDAPPort = case gen_mod:get_opt(ldap_port, Opts, undefined) of undefined -> case ejabberd_config:get_local_option({ldap_port, Host}) of @@ -654,7 +665,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, |