summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorStephen Gallagher <sgallagh@redhat.com>2009-12-08 22:34:55 -0500
committerStephen Gallagher <sgallagh@redhat.com>2009-12-08 23:35:25 -0500
commit46d4c7fd6d5a610f425c7f0a7a8558f726b7dd50 (patch)
tree99b97c744121a88e79590eb58ca51cb57134ce99 /server
parentb7d0f94d223c13ac69d8aab60777c79269b79f49 (diff)
downloadsssd-46d4c7fd6d5a610f425c7f0a7a8558f726b7dd50.tar.gz
sssd-46d4c7fd6d5a610f425c7f0a7a8558f726b7dd50.tar.xz
sssd-46d4c7fd6d5a610f425c7f0a7a8558f726b7dd50.zip
Fix broken SSSDChangeConf.set() function
The set function didn't do anything at all. It needed to use the ipachangeconf.merge() function to behave properly instead of mergeNew()
Diffstat (limited to 'server')
-rw-r--r--server/config/ipachangeconf.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/server/config/ipachangeconf.py b/server/config/ipachangeconf.py
index f06ab4c37..ea73a9b9a 100644
--- a/server/config/ipachangeconf.py
+++ b/server/config/ipachangeconf.py
@@ -528,7 +528,7 @@ class SSSDChangeConf(IPAChangeConf):
}],
'action': 'set',
}
- self.mergeNew(self.opts, [ modkw ])
+ self.opts = self.merge(self.opts, [ modkw ])
def add_section(self, name, optkw, index=0):
optkw.append({'type':'empty', 'value':'empty'})