diff options
| author | Stephen Gallagher <sgallagh@redhat.com> | 2010-03-31 09:10:55 -0400 |
|---|---|---|
| committer | Stephen Gallagher <sgallagh@redhat.com> | 2010-03-31 09:34:20 -0400 |
| commit | 5e12d81215f2a7e49ce61a9513c6624cc1afa1ad (patch) | |
| tree | c89a306a0de8643ad42e2d7d7180224265945fa3 | |
| parent | fc8a12ac4c0eb7fe68f7f289cc69703459a79f58 (diff) | |
| download | sssd-5e12d81215f2a7e49ce61a9513c6624cc1afa1ad.tar.gz sssd-5e12d81215f2a7e49ce61a9513c6624cc1afa1ad.tar.xz sssd-5e12d81215f2a7e49ce61a9513c6624cc1afa1ad.zip | |
Do not revert options to defaults in SSSDConfig.get_domain()
There was a faulty check in get_domain() that led to the
*_provider options being re-added, sometimes after options related
to them had already been set. If those options had a default
value, they would be overwritten by the default.
Fixes: https://fedorahosted.org/sssd/ticket/441
| -rw-r--r-- | src/config/SSSDConfig.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/config/SSSDConfig.py b/src/config/SSSDConfig.py index 2ffb397fe..d4256d1e0 100644 --- a/src/config/SSSDConfig.py +++ b/src/config/SSSDConfig.py @@ -1445,7 +1445,7 @@ class SSSDConfig(SSSDChangeConf): [domain.set_option(opt['name'], opt['value']) for opt in self.strip_comments_empty(self.options('domain/%s' % name)) - if opt not in providers] + if (opt['name'], opt['value']) not in providers] # Determine if this domain is currently active domain.active = self.is_domain_active(name) |