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 diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index bd5778a..478eb9d 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1729091153 -commit: d236d87ed89f720f7cdd75ceb8eee5ce72b6fa3d8878dd5e16de8962d581542b +mtime: 1730829368 +commit: 4c1a7e3419ae2a9fd5571c543bf337898b158276112c19e299f4f385b5bedaf8 url: https://src.opensuse.org/jengelh/sssd revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio index bd55e98..0f4b81f 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1da59a4ad285c59a1bec0b5e555055c02222acfff55369b16ea336a7bb124c5b +oid sha256:333d08feac544fd46469e53065561e077c018a618968d77cc7db859aa36fe6f9 size 256 diff --git a/sssd.changes b/sssd.changes index 97bef57..5cf3900 100644 --- a/sssd.changes +++ b/sssd.changes @@ -16,6 +16,7 @@ Tue Oct 15 12:59:51 UTC 2024 - Jan Engelhardt false to true for improved security. * https://github.com/SSSD/sssd/releases/tag/2.10.0 - Add 0001-sssd-always-print-path-when-config-object-is-rejecte.patch +- Fix socket activation of responders ------------------------------------------------------------------- Tue Oct 1 10:15:07 UTC 2024 - Jan Engelhardt diff --git a/sssd.spec b/sssd.spec index 867b56e..8319ec9 100644 --- a/sssd.spec +++ b/sssd.spec @@ -477,7 +477,7 @@ cp -a system-user-sssd.conf "$b/%_sysusersdir/" %make_build check || : %pre -f random.pre -%service_add_pre sssd.service +%service_add_pre sssd.service sssd-autofs.service sssd-autofs.socket sssd-nss.service sssd-nss.socket sssd-pac.service sssd-pac.socket sssd-pam.service sssd-pam.socket sssd-ssh.service sssd-ssh.socket sssd-sudo.service sssd-sudo.socket %if "%{?_distconfdir}" != "" # Prepare for migration to /usr/etc; save any old .rpmsave for i in sssd/sssd.conf pam.d/sssd-shadowutils logrotate.d/sssd ; do @@ -491,13 +491,13 @@ done if [ -f "%_sysconfdir/sssd/sssd.conf" ]; then /bin/sed -i -e 's,^krb5_kdcip =,krb5_server =,g' "%_sysconfdir/sssd/sssd.conf" fi -%service_add_post sssd.service +%service_add_post sssd.service sssd-autofs.service sssd-autofs.socket sssd-nss.service sssd-nss.socket sssd-pac.service sssd-pac.socket sssd-pam.service sssd-pam.socket sssd-ssh.service sssd-ssh.socket sssd-sudo.service sssd-sudo.socket # install SSSD cifs-idmap plugin as an alternative update-alternatives --install %cifs_idmap_plugin %cifs_idmap_name %cifs_idmap_lib %cifs_idmap_priority %preun -%service_del_preun sssd.service +%service_del_preun sssd.service sssd-autofs.service sssd-autofs.socket sssd-nss.service sssd-nss.socket sssd-pac.service sssd-pac.socket sssd-pam.service sssd-pam.socket sssd-ssh.service sssd-ssh.socket sssd-sudo.service sssd-sudo.socket %postun /sbin/ldconfig @@ -505,7 +505,7 @@ if [ "$1" = "0" ] && [ -x "%_sbindir/pam-config" ]; then "%_sbindir/pam-config" -d --sss || : fi # del_postun includes a try-restart -%service_del_postun sssd.service +%service_del_postun sssd.service sssd-autofs.service sssd-autofs.socket sssd-nss.service sssd-nss.socket sssd-pac.service sssd-pac.socket sssd-pam.service sssd-pam.socket sssd-ssh.service sssd-ssh.socket sssd-sudo.service sssd-sudo.socket if [ ! -f "%cifs_idmap_lib" ]; then update-alternatives --remove %cifs_idmap_name %cifs_idmap_lib