diff options
| author | Stephen Gallagher <sgallagh@redhat.com> | 2010-05-18 10:17:22 -0400 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2010-05-18 13:08:37 -0400 |
| commit | 6663abdda9ce55aace1b19c4170b1153d39136e0 (patch) | |
| tree | d2cff2ef7abe16b461bfb47d5a7df0279d4351e3 /src/config | |
| parent | 49942f408c33a91fd99deae7ca2b3005d6fb56fb (diff) | |
| download | sssd-6663abdda9ce55aace1b19c4170b1153d39136e0.tar.gz sssd-6663abdda9ce55aace1b19c4170b1153d39136e0.tar.xz sssd-6663abdda9ce55aace1b19c4170b1153d39136e0.zip | |
Remove unused ldap_offline_timeout option
Diffstat (limited to 'src/config')
| -rw-r--r-- | src/config/SSSDConfig.py | 1 | ||||
| -rw-r--r-- | src/config/etc/sssd.api.d/sssd-ipa.conf | 1 | ||||
| -rw-r--r-- | src/config/etc/sssd.api.d/sssd-ldap.conf | 1 | ||||
| -rw-r--r-- | src/config/upgrade_config.py | 4 |
4 files changed, 4 insertions, 3 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 ] |