From ae22be810696f35ac8f09930f0168519ba55350c Mon Sep 17 00:00:00 2001 From: Jakub Hrozek Date: Thu, 11 Feb 2010 15:46:23 +0100 Subject: Synchronize IPA and LDAP options --- server/providers/ipa/ipa_common.c | 6 ++++-- 1 file 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, -- cgit