From eb491b523247873edd7d3be201c9e0067f83012e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C5=BDidek?= Date: Thu, 27 Feb 2020 02:51:03 +0100 Subject: [PATCH] Resolves: upstream#4129 - sssctl config-check command does not give proper error messages with line numbers --- ...-config-check-command-error-messages.patch | 35 +++++++++++++++++++ sssd.spec | 7 +++- 2 files changed, 41 insertions(+), 1 deletion(-) create mode 100644 0003-INI-sssctl-config-check-command-error-messages.patch diff --git a/0003-INI-sssctl-config-check-command-error-messages.patch b/0003-INI-sssctl-config-check-command-error-messages.patch new file mode 100644 index 0000000..124b9be --- /dev/null +++ b/0003-INI-sssctl-config-check-command-error-messages.patch @@ -0,0 +1,35 @@ +From b626651847e188e89a332b8ac4bfaaa5047e1b3d Mon Sep 17 00:00:00 2001 +From: Tomas Halman +Date: Tue, 10 Dec 2019 16:30:32 +0100 +Subject: [PATCH] INI: sssctl config-check command error messages +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In case of parsing error sssctl config-check command does not give +proper error messages with line number. With this patch the error +message is printed again. + +Resolves: +https://pagure.io/SSSD/sssd/issue/4129 + +Reviewed-by: Michal Židek +--- + src/util/sss_ini.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/util/sss_ini.c b/src/util/sss_ini.c +index e3699805d..5d91602cd 100644 +--- a/src/util/sss_ini.c ++++ b/src/util/sss_ini.c +@@ -865,6 +865,7 @@ int sss_ini_read_sssd_conf(struct sss_ini *self, + + ret = sss_ini_parse(self); + if (ret != EOK) { ++ sss_ini_config_print_errors(self->error_list); + DEBUG(SSSDBG_FATAL_FAILURE, "Failed to parse configuration.\n"); + return ERR_INI_PARSE_FAILED; + } +-- +2.20.1 + diff --git a/sssd.spec b/sssd.spec index e076a96..95f4042 100644 --- a/sssd.spec +++ b/sssd.spec @@ -36,7 +36,7 @@ Name: sssd Version: 2.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: System Security Services Daemon License: GPLv3+ URL: https://pagure.io/SSSD/sssd/ @@ -45,6 +45,7 @@ Source0: https://releases.pagure.org/SSSD/sssd/%{name}-%{version}.tar.gz ### Patches ### Patch0001: 0001-Fix-build-failure-against-samba-4.12.0rc1.patch Patch0002: 0002-BUILD-Accept-krb5-1.18-for-building-the-PAC-plugin.patch +Patch0003: 0003-INI-sssctl-config-check-command-error-messages.patch ### Downstream only patches ### Patch0502: 0502-SYSTEMD-Use-capabilities.patch @@ -1072,6 +1073,10 @@ fi %{_libdir}/%{name}/modules/libwbclient.so %changelog +* Wed Feb 26 2020 Michal Židek - 2.2.3-2 +- Resolves: upstream#4129 - sssctl config-check command does not give proper + error messages with line numbers + * Wed Feb 26 2020 Michal Židek - 2.2.3-1 - Update to latest released upstream version - https://docs.pagure.org/SSSD.sssd/users/relnotes/notes_2_2_3.htm