From 46d4c7fd6d5a610f425c7f0a7a8558f726b7dd50 Mon Sep 17 00:00:00 2001
From: Stephen Gallagher <sgallagh@redhat.com>
Date: Tue, 8 Dec 2009 22:34:55 -0500
Subject: 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()
---
 server/config/ipachangeconf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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'})
-- 
cgit