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:13 -0400 |
commit | 7acaaa6c6563cf3b8ab20bf6431898d20d735842 (patch) | |
tree | 1ee1e021eefe092c7c40919120134258bc1bcb06 /src | |
parent | b8fa8a206e380b1aeac1a8ea086f6c38cdb97b5e (diff) | |
download | sssd-7acaaa6c6563cf3b8ab20bf6431898d20d735842.tar.gz sssd-7acaaa6c6563cf3b8ab20bf6431898d20d735842.tar.xz sssd-7acaaa6c6563cf3b8ab20bf6431898d20d735842.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
Diffstat (limited to 'src')
-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 431dc2046..6dd8cac2b 100644 --- a/src/config/SSSDConfig.py +++ b/src/config/SSSDConfig.py @@ -1446,7 +1446,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) |