summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakub Hrozek <jhrozek@redhat.com>2010-02-11 15:46:23 +0100
committerStephen Gallagher <sgallagh@redhat.com>2010-02-16 16:06:55 -0500
commitae22be810696f35ac8f09930f0168519ba55350c (patch)
tree19cf5af74d4d7266cc2352a8e5e8fda432f0f404
parent26785017abee76e0eff95214f0c52fcdb04741e0 (diff)
downloadsssd-ae22be810696f35ac8f09930f0168519ba55350c.tar.gz
sssd-ae22be810696f35ac8f09930f0168519ba55350c.tar.xz
sssd-ae22be810696f35ac8f09930f0168519ba55350c.zip
Synchronize IPA and LDAP options
-rw-r--r--server/providers/ipa/ipa_common.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/server/providers/ipa/ipa_common.c b/server/providers/ipa/ipa_common.c
index 5e097a17c..f675e0867 100644
--- a/server/providers/ipa/ipa_common.c
+++ b/server/providers/ipa/ipa_common.c
@@ -62,7 +62,9 @@ struct dp_option ipa_def_ldap_opts[] = {
{ "ldap_krb5_keytab", DP_OPT_STRING, NULL_STRING, NULL_STRING },
{ "ldap_krb5_init_creds", DP_OPT_BOOL, BOOL_TRUE, BOOL_TRUE },
/* use the same parm name as the krb5 module so we set it only once */
- { "krb5_realm", DP_OPT_STRING, NULL_STRING, NULL_STRING }
+ { "krb5_realm", DP_OPT_STRING, NULL_STRING, NULL_STRING },
+ { "ldap_pwd_policy", DP_OPT_STRING, { "none" } , NULL_STRING },
+ { "ldap_referrals", DP_OPT_BOOL, BOOL_TRUE, BOOL_TRUE }
};
struct sdap_attr_map ipa_attr_map[] = {
@@ -215,7 +217,7 @@ done:
/* the following define is 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 30
+#define IPA_OPTS_BASIC_TEST 31
int ipa_get_id_options(struct ipa_options *ipa_opts,
struct confdb_ctx *cdb,