From 3c13b616108d4c0a413380ba72189947898eee57 Mon Sep 17 00:00:00 2001 From: Tyson Whitehead Date: Wed, 19 Jan 2011 15:22:49 -0500 Subject: Add ldap_tls_{cert,key,cipher_suite} config options Signed-off-by: Stephen Gallagher --- src/providers/ipa/ipa_common.c | 3 +++ src/providers/ipa/ipa_common.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'src/providers/ipa') diff --git a/src/providers/ipa/ipa_common.c b/src/providers/ipa/ipa_common.c index 407b9ef53..b3467c606 100644 --- a/src/providers/ipa/ipa_common.c +++ b/src/providers/ipa/ipa_common.c @@ -62,6 +62,9 @@ struct dp_option ipa_def_ldap_opts[] = { { "entry_cache_timeout", DP_OPT_NUMBER, { .number = 1800 }, NULL_NUMBER }, { "ldap_tls_cacert", DP_OPT_STRING, NULL_STRING, NULL_STRING }, { "ldap_tls_cacertdir", DP_OPT_STRING, NULL_STRING, NULL_STRING }, + { "ldap_tls_cert", DP_OPT_STRING, NULL_STRING, NULL_STRING }, + { "ldap_tls_key", DP_OPT_STRING, NULL_STRING, NULL_STRING }, + { "ldap_tls_cipher_suite", DP_OPT_STRING, NULL_STRING, NULL_STRING }, { "ldap_id_use_start_tls", DP_OPT_BOOL, BOOL_FALSE, BOOL_FALSE }, { "ldap_sasl_mech", DP_OPT_STRING, { "GSSAPI" } , NULL_STRING }, { "ldap_sasl_authid", DP_OPT_STRING, NULL_STRING, NULL_STRING }, diff --git a/src/providers/ipa/ipa_common.h b/src/providers/ipa/ipa_common.h index 294e84fa5..39fe31dc5 100644 --- a/src/providers/ipa/ipa_common.h +++ b/src/providers/ipa/ipa_common.h @@ -35,7 +35,7 @@ struct ipa_service { /* the following defines are used to keep track of the options in the ldap * module, so that if they change and ipa is not updated correspondingly * this will trigger a runtime abort error */ -#define IPA_OPTS_BASIC_TEST 44 +#define IPA_OPTS_BASIC_TEST 47 /* the following define is used to keep track of the options in the krb5 * module, so that if they change and ipa is not updated correspondingly -- cgit