[SSSD] [PATCH] CONFDB: Assume config file version 2 if missing
Lukas Slebodnik
lslebodn at redhat.com
Thu Aug 6 11:39:53 UTC 2015
On (05/08/15 13:41), Michal Židek wrote:
>On 07/30/2015 06:08 PM, Lukas Slebodnik wrote:
>>>>>- } else if (version < CONFDB_VERSION_INT) {
>>>>>- DEBUG(SSSDBG_FATAL_FAILURE,
>>>>>- "Config file is an old version. "
>>>>>- "Please run configuration upgrade script.\n");
>>>>>- ret = EINVAL;
>>>>>- goto done;
>>>>>- } else if (version > CONFDB_VERSION_INT) {
>>>>>- DEBUG(SSSDBG_FATAL_FAILURE,
>>>>>- "Config file version is newer than confdb\n");
>>>>>- ret = EINVAL;
>>>>>- goto done;
>>>>>+ /* No known version. Use default. */
>>>>>+ DEBUG(SSSDBG_CONF_SETTINGS,
>>>>>+ "Value of config_file_version option not found. "
>>>>>+ "Assumed to be version %d.\n", CONFDB_DEFAULT_CFG_FILE_VER);
>>>>>+ } else {
>>>>>+ version = sss_ini_get_int_config_value(init_data,
>>>>>+ CONFDB_DEFAULT_CFG_FILE_VER,
>>>>>+ -1, &ret);
>>>>>+ if (ret != EOK) {
>>>>>+ DEBUG(SSSDBG_FATAL_FAILURE,
>>>>>+ "Config file version could not be determined\n");
>> ^^
>>I do not prefer nested "if"s. If you decided to do it in this way then
>
>Me neither, but sss_ini_get_int_config_value() has to be
>skipped conditionally. It is just call to the function
>plus error checking that is nested. I think it is not
>too bad in this case.
>
>>you shoudl have proper indentation.
>>
>
>Fixed in the new version.
>
It works because integration tests passed.
http://sssd-ci.duckdns.org/logs/job/20/68/summary.html
But ...
I tested new version with ipa-client-install
and "config_file_version = 2" is still added to sssd.conf
even though it is a default value.
ipa-client-install uses our python API (python-sssdconfig)
and it does not try to add this option itself.
Please also remove config_file_version from test_memory_cache.py
LS
More information about the sssd-devel
mailing list