diff options
| author | Michal Židek <mzidek@redhat.com> | 2015-07-07 15:15:32 +0200 |
|---|---|---|
| committer | Jakub Hrozek <jhrozek@redhat.com> | 2015-09-03 09:32:15 +0200 |
| commit | 175613be0cfb0890174d12d941e634d833b63dd9 (patch) | |
| tree | f60beceb3b170ceca78cbb8cf7d668d3ce9aec0f /src/config/SSSDConfig | |
| parent | 3954cd07dae78bf79136f0854472757d1ed26897 (diff) | |
| download | sssd-175613be0cfb0890174d12d941e634d833b63dd9.tar.gz sssd-175613be0cfb0890174d12d941e634d833b63dd9.tar.xz sssd-175613be0cfb0890174d12d941e634d833b63dd9.zip | |
CONFDB: Assume config file version 2 if missing
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>
Diffstat (limited to 'src/config/SSSDConfig')
| -rw-r--r-- | src/config/SSSDConfig/__init__.py.in | 5 | ||||
| -rw-r--r-- | src/config/SSSDConfig/sssd_upgrade_config.py | 3 |
2 files changed, 2 insertions, 6 deletions
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: |