summaryrefslogtreecommitdiffstats
path: root/server/config/SSSDConfig.py
diff options
context:
space:
mode:
authorStephen Gallagher <sgallagh@redhat.com>2009-12-07 14:50:48 -0500
committerStephen Gallagher <sgallagh@redhat.com>2009-12-08 23:35:29 -0500
commitafa260fcc56bde83e4b77282c7b3b22cfb4eca47 (patch)
tree48fb986e0e32629b198919e19c4fc26cb985ac70 /server/config/SSSDConfig.py
parent62bbadfe0aaa9348e3a05b5ce960e8c4e5a8d44b (diff)
downloadsssd-afa260fcc56bde83e4b77282c7b3b22cfb4eca47.tar.gz
sssd-afa260fcc56bde83e4b77282c7b3b22cfb4eca47.tar.xz
sssd-afa260fcc56bde83e4b77282c7b3b22cfb4eca47.zip
SSSDDomain.remove_provider() requires only the provider type
There was no valid reason to require the backend type when specifying a provider to remove.
Diffstat (limited to 'server/config/SSSDConfig.py')
-rw-r--r--server/config/SSSDConfig.py18
1 files changed, 12 insertions, 6 deletions
diff --git a/server/config/SSSDConfig.py b/server/config/SSSDConfig.py
index 1cbf1a84d..1992a9404 100644
--- a/server/config/SSSDConfig.py
+++ b/server/config/SSSDConfig.py
@@ -787,14 +787,12 @@ class SSSDDomain(SSSDConfigObject):
provider_type)))
- def remove_provider(self, provider, provider_type):
+ def remove_provider(self, provider_type):
"""
Remove a provider from the domain. If the provider is not present, it
is ignored.
- type:
- Provider backend type. (e.g. local, ldap, krb5, etc.)
- subtype:
+ provider_type:
Subtype of the backend type. (e.g. id, auth, chpass)
=== Returns ===
@@ -803,7 +801,15 @@ class SSSDDomain(SSSDConfigObject):
=== Errors ===
No Errors
"""
- if (provider,provider_type) not in self.providers:
+
+ provider = None
+ for (provider, ptype) in self.providers:
+ if ptype == provider_type:
+ break
+ provider = None
+
+ # Check whether the provider_type was found
+ if not provider:
return
# TODO: safely remove any unused options when removing
@@ -811,7 +817,7 @@ class SSSDDomain(SSSDConfigObject):
# to account for multiple providers making use of the
# same options (such ask krb5_realm)
- self.providers.remove((provider,provider_type))
+ self.providers.remove((provider, provider_type))
class SSSDConfig(SSSDChangeConf):
"""