From 175613be0cfb0890174d12d941e634d833b63dd9 Mon Sep 17 00:00:00 2001
From: Michal Židek <mzidek@redhat.com>
Date: Tue, 7 Jul 2015 15:15:32 +0200
Subject: CONFDB: Assume config file version 2 if missing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Default to config file version 2 if the version
is not specified explicitly.

Ticket:
https://fedorahosted.org/sssd/ticket/2688

Reviewed-by: Lukáš Slebodník <lslebodn@redhat.com>
---
 src/config/SSSDConfig/__init__.py.in         |  5 -----
 src/config/SSSDConfig/sssd_upgrade_config.py |  3 ++-
 src/config/SSSDConfigTest.py                 | 11 ++---------
 3 files changed, 4 insertions(+), 15 deletions(-)

(limited to 'src/config')

diff --git a/src/config/SSSDConfig/__init__.py.in b/src/config/SSSDConfig/__init__.py.in
index f10b58c5c..cb9c368b9 100644
--- a/src/config/SSSDConfig/__init__.py.in
+++ b/src/config/SSSDConfig/__init__.py.in
@@ -738,11 +738,6 @@ class SSSDService(SSSDConfigObject):
         # Set up default options for this service
         self.options.update(self.schema.get_defaults(self.name))
 
-        # For the [sssd] service, force the config file version
-        if servicename == 'sssd':
-            self.options['config_file_version'] = 2
-            self.hidden_options.append('config_file_version')
-
     def list_options_with_mandatory(self):
         """
         List options for the service, including the mandatory flag.
diff --git a/src/config/SSSDConfig/sssd_upgrade_config.py b/src/config/SSSDConfig/sssd_upgrade_config.py
index 282d6c46f..767d06ddc 100644
--- a/src/config/SSSDConfig/sssd_upgrade_config.py
+++ b/src/config/SSSDConfig/sssd_upgrade_config.py
@@ -47,7 +47,8 @@ class SSSDConfigFile(SSSDChangeConf):
     def get_version(self):
         ver = self.get_option_index('sssd', 'config_file_version')[1]
         if not ver:
-            return 1
+            # config_file_version not found -> default to version 2
+            return 2
         try:
             return int(ver['value'])
         except ValueError:
diff --git a/src/config/SSSDConfigTest.py b/src/config/SSSDConfigTest.py
index 4aefe6702..5047bd723 100755
--- a/src/config/SSSDConfigTest.py
+++ b/src/config/SSSDConfigTest.py
@@ -403,9 +403,6 @@ class SSSDConfigTestSSSDService(unittest.TestCase):
     def testGetOption(self):
         service = SSSDConfig.SSSDService('sssd', self.schema)
 
-        # Positive test - Single-valued
-        self.assertEqual(service.get_option('config_file_version'), 2)
-
         # Positive test - List of values
         self.assertEqual(service.get_option('services'), ['nss', 'pam'])
 
@@ -417,9 +414,7 @@ class SSSDConfigTestSSSDService(unittest.TestCase):
 
         #Positive test
         options = service.get_all_options()
-        control_list = [
-            'config_file_version',
-            'services']
+        control_list = ['services']
 
         self.assertTrue(type(options) == dict,
                         "Options should be a dictionary")
@@ -1266,9 +1261,7 @@ class SSSDConfigTestSSSDConfig(unittest.TestCase):
         for section in sssdconfig.sections():
             self.assertTrue(section['name'] in control_list)
 
-        control_list = [
-            'config_file_version',
-            'services']
+        control_list = ['services']
         for option in control_list:
             self.assertTrue(sssdconfig.has_option('sssd', option),
                             "Option [%s] missing from [sssd]" %
-- 
cgit