From 3a21103f61bf9b60256cc2d0da54b757b634319f Mon Sep 17 00:00:00 2001 From: Simo Sorce Date: Sat, 24 Oct 2009 13:36:34 -0400 Subject: Move responsibility for entry expiration timeout The providers are now responsible for determining how long a cached entry is considered valid. The default is the same as before (600s) --- server/providers/ipa/ipa_common.c | 8 ++++---- server/providers/ipa/ipa_common.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'server/providers/ipa') diff --git a/server/providers/ipa/ipa_common.c b/server/providers/ipa/ipa_common.c index e87373f52..83f3f6760 100644 --- a/server/providers/ipa/ipa_common.c +++ b/server/providers/ipa/ipa_common.c @@ -34,7 +34,7 @@ struct dp_option ipa_basic_opts[] = { { "ipa_opt_timeout", DP_OPT_NUMBER, { .number = 6 }, NULL_NUMBER }, { "ipa_offline_timeout", DP_OPT_NUMBER, { .number = 60 }, NULL_NUMBER }, { "ipa_enumeration_refresh_timeout", DP_OPT_NUMBER, { .number = 300 }, NULL_NUMBER }, - { "ipa_stale_time", DP_OPT_NUMBER, { .number = 1800 }, NULL_NUMBER }, + { "entry_cache_timeout", DP_OPT_NUMBER, { .number = 1800 }, NULL_NUMBER }, }; struct dp_option ipa_def_ldap_opts[] = { @@ -56,7 +56,7 @@ struct dp_option ipa_def_ldap_opts[] = { { "ldap_offline_timeout", DP_OPT_NUMBER, { .number = 60 }, NULL_NUMBER }, { "ldap_force_upper_case_realm", DP_OPT_BOOL, BOOL_TRUE, BOOL_TRUE }, { "ldap_enumeration_refresh_timeout", DP_OPT_NUMBER, { .number = 300 }, NULL_NUMBER }, - { "ldap_stale_time", DP_OPT_NUMBER, { .number = 1800 }, NULL_NUMBER }, + { "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_id_use_start_tls", DP_OPT_BOOL, BOOL_FALSE, BOOL_FALSE }, @@ -322,9 +322,9 @@ int ipa_get_id_options(TALLOC_CTX *memctx, dp_opt_get_int(ipa_opts->basic, IPA_ENUM_REFRESH_TIMEOUT)); ret = dp_opt_set_int(ipa_opts->id->basic, - SDAP_STALE_TIME, + SDAP_ENTRY_CACHE_TIMEOUT, dp_opt_get_int(ipa_opts->basic, - IPA_STALE_TIME)); + IPA_ENTRY_CACHE_TIMEOUT)); ret = sdap_get_map(ipa_opts->id, cdb, conf_path, diff --git a/server/providers/ipa/ipa_common.h b/server/providers/ipa/ipa_common.h index f7d3ab8cb..83ce48876 100644 --- a/server/providers/ipa/ipa_common.h +++ b/server/providers/ipa/ipa_common.h @@ -36,7 +36,7 @@ enum ipa_basic_opt { IPA_OPT_TIMEOUT, IPA_OFFLINE_TIMEOUT, IPA_ENUM_REFRESH_TIMEOUT, - IPA_STALE_TIME, + IPA_ENTRY_CACHE_TIMEOUT, IPA_OPTS_BASIC /* opts counter */ }; -- cgit