From 34e8574098caa0fb5cc6d7354255201fba83ffb5350cda85d2f429f4778ddb3a Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 5 Nov 2024 18:52:51 +0100 Subject: [PATCH] Update 0001-sssd-always-print-path-when-config-object-is-rejecte.patch with accepted commit --- ...t-path-when-config-object-is-rejecte.patch | 29 +++++-------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/0001-sssd-always-print-path-when-config-object-is-rejecte.patch b/0001-sssd-always-print-path-when-config-object-is-rejecte.patch index 5ea6697..d24c30a 100644 --- a/0001-sssd-always-print-path-when-config-object-is-rejecte.patch +++ b/0001-sssd-always-print-path-when-config-object-is-rejecte.patch @@ -1,4 +1,4 @@ -From 338638cd5f374e0699d7b7495a5fa8f25511fa55 Mon Sep 17 00:00:00 2001 +From 1a743a4123c104a10c694f7ee9d2f0a1e7182513 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 16 Oct 2024 09:55:50 +0200 Subject: [PATCH] sssd: always print path when config object is rejected @@ -15,27 +15,14 @@ Oct 16 09:44:04 a4 sssd[28717]: Failed to read configuration: 'File ownership an Expected: _Well yes, but **which one**_!? ---- - src/monitor/monitor.c | 4 ++-- - src/util/sss_ini.c | 14 ++++++++------ - 2 files changed, 10 insertions(+), 8 deletions(-) -diff --git a/src/monitor/monitor.c b/src/monitor/monitor.c -index e17b0e416..f67e4446f 100644 ---- a/src/monitor/monitor.c -+++ b/src/monitor/monitor.c -@@ -1931,9 +1931,9 @@ int main(int argc, const char *argv[]) - ret = confdb_read_ini(tmp_ctx, config_file, CONFDB_DEFAULT_CONFIG_DIR, false, - &config); - if (ret != EOK) { -- ERROR("Can't read config: '%s'\n", sss_strerror(ret)); -+ ERROR("Cannot read config %s: '%s'\n", config_file, sss_strerror(ret)); - sss_log(SSS_LOG_ALERT, -- "Failed to read configuration: '%s'", sss_strerror(ret)); -+ "Failed to read configuration %s: '%s'", config_file, sss_strerror(ret)); - ret = 3; - goto out; - } +Reviewed-by: Alexey Tikhonov +Reviewed-by: Justin Stephenson +(cherry picked from commit 2b7915dd84a6b8c3ee26e45357283677fe22f2cb) +--- + src/util/sss_ini.c | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) + diff --git a/src/util/sss_ini.c b/src/util/sss_ini.c index 7f9824d88..2a611eb8c 100644 --- a/src/util/sss_ini.c