From 6663abdda9ce55aace1b19c4170b1153d39136e0 Mon Sep 17 00:00:00 2001 From: Stephen Gallagher Date: Tue, 18 May 2010 10:17:22 -0400 Subject: Remove unused ldap_offline_timeout option --- src/config/SSSDConfig.py | 1 - src/config/etc/sssd.api.d/sssd-ipa.conf | 1 - src/config/etc/sssd.api.d/sssd-ldap.conf | 1 - src/config/upgrade_config.py | 4 ++++ src/providers/ipa/ipa_common.c | 1 - src/providers/ipa/ipa_common.h | 2 +- src/providers/ldap/ldap_common.c | 1 - src/providers/ldap/sdap.h | 1 - 8 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/config/SSSDConfig.py b/src/config/SSSDConfig.py index 7b9d96c9e..29de609a6 100644 --- a/src/config/SSSDConfig.py +++ b/src/config/SSSDConfig.py @@ -115,7 +115,6 @@ option_strings = { 'ldap_default_authtok' : _('The authentication token of the default bind DN'), 'ldap_network_timeout' : _('Length of time to attempt connection'), 'ldap_opt_timeout' : _('Length of time to attempt synchronous LDAP operations'), - 'ldap_offline_timeout' : _('Length of time between attempts to reconnect while offline'), 'ldap_tls_cacert' : _('File that contains CA certificates'), 'ldap_tls_cacertdir' : _('Path to CA certificate directory'), 'ldap_tls_reqcert' : _('Require TLS certificate verification'), diff --git a/src/config/etc/sssd.api.d/sssd-ipa.conf b/src/config/etc/sssd.api.d/sssd-ipa.conf index 75a08ac3a..94deecbc6 100644 --- a/src/config/etc/sssd.api.d/sssd-ipa.conf +++ b/src/config/etc/sssd.api.d/sssd-ipa.conf @@ -12,7 +12,6 @@ ldap_default_authtok_type = str, None, false ldap_default_authtok = str, None, false ldap_network_timeout = int, None, false ldap_opt_timeout = int, None, false -ldap_offline_timeout = int, None, false ldap_tls_cacert = str, None, false ldap_tls_reqcert = str, None, false ldap_sasl_mech = str, None, false diff --git a/src/config/etc/sssd.api.d/sssd-ldap.conf b/src/config/etc/sssd.api.d/sssd-ldap.conf index 6ea9de7dd..5e6b32de9 100644 --- a/src/config/etc/sssd.api.d/sssd-ldap.conf +++ b/src/config/etc/sssd.api.d/sssd-ldap.conf @@ -7,7 +7,6 @@ ldap_default_authtok_type = str, None, false ldap_default_authtok = str, None, false ldap_network_timeout = int, None, false ldap_opt_timeout = int, None, false -ldap_offline_timeout = int, None, false ldap_tls_cacert = str, None, false ldap_tls_cacertdir = str, None, false ldap_tls_reqcert = str, None, false diff --git a/src/config/upgrade_config.py b/src/config/upgrade_config.py index d47fcd38c..32f820440 100644 --- a/src/config/upgrade_config.py +++ b/src/config/upgrade_config.py @@ -73,6 +73,10 @@ class SSSDConfigFile(SSSDChangeConf): for domain in [ s for s in self.sections() if s['name'].startswith("domain/") ]: self.delete_option_subtree(domain['value'], 'option', 'magic_private_groups') + # remove ldap_offline_timeout from all domains + for domain in [ s for s in self.sections() if s['name'].startswith("domain/") ]: + self.delete_option_subtree(domain['value'], 'option', 'ldap_offline_timeout') + def _update_option(self, to_section_name, from_section_name, opts): to_section = [ s for s in self.sections() if s['name'].strip() == to_section_name ] from_section = [ s for s in self.sections() if s['name'].strip() == from_section_name ] diff --git a/src/providers/ipa/ipa_common.c b/src/providers/ipa/ipa_common.c index 0624b79f5..4bcd534c8 100644 --- a/src/providers/ipa/ipa_common.c +++ b/src/providers/ipa/ipa_common.c @@ -53,7 +53,6 @@ struct dp_option ipa_def_ldap_opts[] = { { "ldap_group_search_scope", DP_OPT_STRING, { "sub" }, NULL_STRING }, { "ldap_group_search_filter", DP_OPT_STRING, NULL_STRING, NULL_STRING }, { "ldap_schema", DP_OPT_STRING, { "ipa_v1" }, NULL_STRING }, - { "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_purge_cache_timeout", DP_OPT_NUMBER, { .number = 3600 }, NULL_NUMBER }, diff --git a/src/providers/ipa/ipa_common.h b/src/providers/ipa/ipa_common.h index fe9ca5418..9678e0cea 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 35 +#define IPA_OPTS_BASIC_TEST 34 /* 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 diff --git a/src/providers/ldap/ldap_common.c b/src/providers/ldap/ldap_common.c index 5beb2e66a..8fcea9677 100644 --- a/src/providers/ldap/ldap_common.c +++ b/src/providers/ldap/ldap_common.c @@ -47,7 +47,6 @@ struct dp_option default_basic_opts[] = { { "ldap_group_search_scope", DP_OPT_STRING, { "sub" }, NULL_STRING }, { "ldap_group_search_filter", DP_OPT_STRING, NULL_STRING, NULL_STRING }, { "ldap_schema", DP_OPT_STRING, { "rfc2307" }, NULL_STRING }, - { "ldap_offline_timeout", DP_OPT_NUMBER, { .number = 60 }, NULL_NUMBER }, { "ldap_force_upper_case_realm", DP_OPT_BOOL, BOOL_FALSE, BOOL_FALSE }, { "ldap_enumeration_refresh_timeout", DP_OPT_NUMBER, { .number = 300 }, NULL_NUMBER }, { "ldap_purge_cache_timeout", DP_OPT_NUMBER, { .number = 10800 }, NULL_NUMBER }, diff --git a/src/providers/ldap/sdap.h b/src/providers/ldap/sdap.h index 3dc84166e..0fc95df84 100644 --- a/src/providers/ldap/sdap.h +++ b/src/providers/ldap/sdap.h @@ -134,7 +134,6 @@ enum sdap_basic_opt { SDAP_GROUP_SEARCH_SCOPE, SDAP_GROUP_SEARCH_FILTER, SDAP_SCHEMA, - SDAP_OFFLINE_TIMEOUT, SDAP_FORCE_UPPER_CASE_REALM, SDAP_ENUM_REFRESH_TIMEOUT, SDAP_CACHE_PURGE_TIMEOUT, -- cgit