summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimo Sorce <ssorce@redhat.com>2009-10-24 11:24:18 -0400
committerSimo Sorce <simo@metason.pico.li.ssimo.org>2009-10-26 10:23:59 -0400
commit5813090abca8013563112813a341a77a87466233 (patch)
treea3a47d4d45e423c1e87042107561d5aaa908f8c8
parentda99fdfa21f70f5d2f1524eff20a034e9e1d6b71 (diff)
downloadsssd-5813090abca8013563112813a341a77a87466233.tar.gz
sssd-5813090abca8013563112813a341a77a87466233.tar.bz2
sssd-5813090abca8013563112813a341a77a87466233.zip
Copy option overrides.
We were not copying IPA named options to the ldap id options list. So the ldap_id provider was always using just the default settings.
-rw-r--r--server/providers/ipa/ipa_common.c26
1 files changed, 26 insertions, 0 deletions
diff --git a/server/providers/ipa/ipa_common.c b/server/providers/ipa/ipa_common.c
index a0dd3a55..e87373f5 100644
--- a/server/providers/ipa/ipa_common.c
+++ b/server/providers/ipa/ipa_common.c
@@ -300,6 +300,32 @@ int ipa_get_id_options(TALLOC_CTX *memctx,
/* fix schema to IPAv1 for now */
ipa_opts->id->schema_type = SDAP_SCHEMA_IPA_V1;
+ /* copy over timeouts */
+ ret = dp_opt_set_int(ipa_opts->id->basic,
+ SDAP_SEARCH_TIMEOUT,
+ dp_opt_get_int(ipa_opts->basic,
+ IPA_SEARCH_TIMEOUT));
+ ret = dp_opt_set_int(ipa_opts->id->basic,
+ SDAP_NETWORK_TIMEOUT,
+ dp_opt_get_int(ipa_opts->basic,
+ IPA_NETWORK_TIMEOUT));
+ ret = dp_opt_set_int(ipa_opts->id->basic,
+ SDAP_OPT_TIMEOUT,
+ dp_opt_get_int(ipa_opts->basic,
+ IPA_OPT_TIMEOUT));
+ ret = dp_opt_set_int(ipa_opts->id->basic,
+ SDAP_OFFLINE_TIMEOUT,
+ dp_opt_get_int(ipa_opts->basic,
+ IPA_OFFLINE_TIMEOUT));
+ ret = dp_opt_set_int(ipa_opts->id->basic,
+ SDAP_ENUM_REFRESH_TIMEOUT,
+ dp_opt_get_int(ipa_opts->basic,
+ IPA_ENUM_REFRESH_TIMEOUT));
+ ret = dp_opt_set_int(ipa_opts->id->basic,
+ SDAP_STALE_TIME,
+ dp_opt_get_int(ipa_opts->basic,
+ IPA_STALE_TIME));
+
ret = sdap_get_map(ipa_opts->id,
cdb, conf_path,
ipa_user_map,