Compare commits
2 Commits
d236d87ed8
...
4c1a7e3419
Author | SHA256 | Date | |
---|---|---|---|
|
4c1a7e3419 | ||
0b818bbcb7 |
@ -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 <jengelh@inai.de>
|
From: Jan Engelhardt <jengelh@inai.de>
|
||||||
Date: Wed, 16 Oct 2024 09:55:50 +0200
|
Date: Wed, 16 Oct 2024 09:55:50 +0200
|
||||||
Subject: [PATCH] sssd: always print path when config object is rejected
|
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:
|
Expected:
|
||||||
|
|
||||||
_Well yes, but **which one**_!?
|
_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
|
Reviewed-by: Alexey Tikhonov <atikhono@redhat.com>
|
||||||
index e17b0e416..f67e4446f 100644
|
Reviewed-by: Justin Stephenson <jstephen@redhat.com>
|
||||||
--- a/src/monitor/monitor.c
|
(cherry picked from commit 2b7915dd84a6b8c3ee26e45357283677fe22f2cb)
|
||||||
+++ b/src/monitor/monitor.c
|
---
|
||||||
@@ -1931,9 +1931,9 @@ int main(int argc, const char *argv[])
|
src/util/sss_ini.c | 14 ++++++++------
|
||||||
ret = confdb_read_ini(tmp_ctx, config_file, CONFDB_DEFAULT_CONFIG_DIR, false,
|
1 file changed, 8 insertions(+), 6 deletions(-)
|
||||||
&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;
|
|
||||||
}
|
|
||||||
diff --git a/src/util/sss_ini.c b/src/util/sss_ini.c
|
diff --git a/src/util/sss_ini.c b/src/util/sss_ini.c
|
||||||
index 7f9824d88..2a611eb8c 100644
|
index 7f9824d88..2a611eb8c 100644
|
||||||
--- a/src/util/sss_ini.c
|
--- a/src/util/sss_ini.c
|
||||||
|
@ -16,6 +16,7 @@ Tue Oct 15 12:59:51 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
|
|||||||
false to true for improved security.
|
false to true for improved security.
|
||||||
* https://github.com/SSSD/sssd/releases/tag/2.10.0
|
* https://github.com/SSSD/sssd/releases/tag/2.10.0
|
||||||
- Add 0001-sssd-always-print-path-when-config-object-is-rejecte.patch
|
- 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 <jengelh@inai.de>
|
Tue Oct 1 10:15:07 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
|
||||||
|
@ -477,7 +477,7 @@ cp -a system-user-sssd.conf "$b/%_sysusersdir/"
|
|||||||
%make_build check || :
|
%make_build check || :
|
||||||
|
|
||||||
%pre -f random.pre
|
%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}" != ""
|
%if "%{?_distconfdir}" != ""
|
||||||
# Prepare for migration to /usr/etc; save any old .rpmsave
|
# Prepare for migration to /usr/etc; save any old .rpmsave
|
||||||
for i in sssd/sssd.conf pam.d/sssd-shadowutils logrotate.d/sssd ; do
|
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
|
if [ -f "%_sysconfdir/sssd/sssd.conf" ]; then
|
||||||
/bin/sed -i -e 's,^krb5_kdcip =,krb5_server =,g' "%_sysconfdir/sssd/sssd.conf"
|
/bin/sed -i -e 's,^krb5_kdcip =,krb5_server =,g' "%_sysconfdir/sssd/sssd.conf"
|
||||||
fi
|
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
|
# install SSSD cifs-idmap plugin as an alternative
|
||||||
update-alternatives --install %cifs_idmap_plugin %cifs_idmap_name %cifs_idmap_lib %cifs_idmap_priority
|
update-alternatives --install %cifs_idmap_plugin %cifs_idmap_name %cifs_idmap_lib %cifs_idmap_priority
|
||||||
|
|
||||||
%preun
|
%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
|
%postun
|
||||||
/sbin/ldconfig
|
/sbin/ldconfig
|
||||||
@ -505,7 +505,7 @@ if [ "$1" = "0" ] && [ -x "%_sbindir/pam-config" ]; then
|
|||||||
"%_sbindir/pam-config" -d --sss || :
|
"%_sbindir/pam-config" -d --sss || :
|
||||||
fi
|
fi
|
||||||
# del_postun includes a try-restart
|
# 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
|
if [ ! -f "%cifs_idmap_lib" ]; then
|
||||||
update-alternatives --remove %cifs_idmap_name %cifs_idmap_lib
|
update-alternatives --remove %cifs_idmap_name %cifs_idmap_lib
|
||||||
|
Loading…
Reference in New Issue
Block a user