diff --git a/.sssd.spec.swp b/.sssd.spec.swp new file mode 100644 index 0000000000000000000000000000000000000000..3fde5ea35ae82fe6d7d19ef6844a671497f8fc3c Binary files /dev/null and b/.sssd.spec.swp differ diff --git a/Fix-pid-wrapping-in-sss_cli_check_socket.patch b/Fix-pid-wrapping-in-sss_cli_check_socket.patch deleted file mode 100644 index 160f262799f74cdfae374eec132c6da6421d00bc..0000000000000000000000000000000000000000 --- a/Fix-pid-wrapping-in-sss_cli_check_socket.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -Naur sssd-2.8.2/src/sss_client/common.c sssd-2.8.2-b/src/sss_client/common.c ---- sssd-2.8.2/src/sss_client/common.c 2023-03-28 11:25:28.000000000 +0800 -+++ sssd-2.8.2-b/src/sss_client/common.c 2023-03-28 11:26:09.000000000 +0800 -@@ -663,22 +663,27 @@ - const char *socket_name, - int timeout) - { -- static pid_t mypid; -- struct stat mysb; -+ static pid_t mypid_s; -+ static ino_t myself_ino; -+ struct stat mypid_sb, myself_sb; -+ pid_t mypid_d; - int mysd; - int ret; - -- if (getpid() != mypid) { -- ret = fstat(sss_cli_sd, &mysb); -+ ret = lstat("/proc/self/", &myself_sb); -+ mypid_d = getpid(); -+ if (mypid_d != mypid_s || (ret == 0 && myself_sb.st_ino != myself_ino)) { -+ ret = fstat(sss_cli_sd, &mypid_sb); - if (ret == 0) { -- if (S_ISSOCK(mysb.st_mode) && -- mysb.st_dev == sss_cli_sb.st_dev && -- mysb.st_ino == sss_cli_sb.st_ino) { -+ if (S_ISSOCK(mypid_sb.st_mode) && -+ mypid_sb.st_dev == sss_cli_sb.st_dev && -+ mypid_sb.st_ino == sss_cli_sb.st_ino) { - sss_cli_close_socket(); - } - } - sss_cli_sd = -1; -- mypid = getpid(); -+ mypid_s = mypid_d; -+ myself_ino = myself_sb.st_ino; - } - - /* check if the socket has been closed on the other side */ diff --git a/MONITOR-fix-socket_activated-flag-initialization.patch b/MONITOR-fix-socket_activated-flag-initialization.patch deleted file mode 100644 index 63f99bbe5adb24254638f3592032955ad9f36eb8..0000000000000000000000000000000000000000 --- a/MONITOR-fix-socket_activated-flag-initialization.patch +++ /dev/null @@ -1,47 +0,0 @@ -From d4f7ed69dbd3aad3be2c52d2da5f75af6d32e3c0 Mon Sep 17 00:00:00 2001 -From: Alexey Tikhonov -Date: Mon, 13 Feb 2023 17:48:41 +0100 -Subject: [PATCH] MONITOR: fix `socket_activated` flag initialization -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When socket activated service connects for the first time, it is added to -`mt_ctx->svc_list` by `socket_activated_service_not_found()` with a proper -`socket_activated = true`. -But when it reconnects again, `get_service_in_the_list()` finds it in -`mt_ctx->svc_list` and overwrites `socket_activated = false` unconditionally. -This patch moves `socket_activated = false` to `start_service()`. - -Resolves: https://github.com/SSSD/sssd/issues/6324 - -Reviewed-by: Iker Pedrosa -Reviewed-by: Pavel Březina ---- - src/monitor/monitor.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/monitor/monitor.c b/src/monitor/monitor.c -index 6d3d05cd3..0972465f9 100644 ---- a/src/monitor/monitor.c -+++ b/src/monitor/monitor.c -@@ -242,7 +242,6 @@ get_service_in_the_list(struct mt_ctx *mt_ctx, - - for (svc = mt_ctx->svc_list; svc != NULL; svc = svc->next) { - if (strcasecmp(svc->identity, svc_name) == 0) { -- svc->socket_activated = false; - *_svc = svc; - return EOK; - } -@@ -1802,6 +1801,8 @@ static int start_service(struct mt_svc *svc) - - DEBUG(SSSDBG_CONF_SETTINGS,"Queueing service %s for startup\n", svc->name); - -+ svc->socket_activated = false; -+ - tv = tevent_timeval_current(); - - /* Add a timed event to start up the service. --- -2.36.1 - diff --git a/sssd-2.8.2.tar.gz b/sssd-2.9.1.tar.gz similarity index 50% rename from sssd-2.8.2.tar.gz rename to sssd-2.9.1.tar.gz index f0c15720ea65c00683bb76bc1ce1db679a4c39e8..c7801f238a67efc2066fd342ef1f6d0d4c86aaf1 100644 Binary files a/sssd-2.8.2.tar.gz and b/sssd-2.9.1.tar.gz differ diff --git a/sssd.spec b/sssd.spec index aefc91bb39daf4c0bdc0e28a3843c0795e3ff7b2..8b6eb351d5e230664735cb863670ea3200bb227e 100644 --- a/sssd.spec +++ b/sssd.spec @@ -1,14 +1,11 @@ Name: sssd -Version: 2.8.2 -Release: 5 +Version: 2.9.1 +Release: 1 Summary: System Security Services Daemon License: GPLv3+ and LGPLv3+ URL: https://pagure.io/SSSD/sssd/ Source0: https://github.com/SSSD/sssd/releases/download/%{version}/%{name}-%{version}.tar.gz -Patch6000: MONITOR-fix-socket_activated-flag-initialization.patch -Patch6001: Fix-pid-wrapping-in-sss_cli_check_socket.patch - Requires: python3-sssd = %{version}-%{release} Requires: libldb Requires: cyrus-sasl-gssapi%{?_isa} @@ -226,7 +223,6 @@ chrpath -d $RPM_BUILD_ROOT%{_libexecdir}/sssd/sssd_pac chrpath -d $RPM_BUILD_ROOT%{_libdir}/%{name}/libsss_krb5.so chrpath -d $RPM_BUILD_ROOT%{ldb_modulesdir}/memberof.so -chrpath -d $RPM_BUILD_ROOT%{_libdir}/%{name}/libsss_files.so chrpath -d $RPM_BUILD_ROOT%{_libdir}/%{name}/libsss_simple.so chrpath -d $RPM_BUILD_ROOT%{_libdir}/%{name}/libsss_child.so chrpath -d $RPM_BUILD_ROOT%{_libdir}/%{name}/libsss_semanage.so @@ -315,7 +311,6 @@ done %{_libexecdir}/sssd/sssd_check_socket_activated_responders %dir %{_libdir}/%{name} -%{_libdir}/%{name}/libsss_files.so %{_libdir}/%{name}/libsss_simple.so %{_libdir}/%{name}/libsss_child.so @@ -420,7 +415,7 @@ done %{_libexecdir}/sssd/sssd_ifp %{_unitdir}/sssd-ifp.service -%{_sysconfdir}/dbus-1/system.d/org.freedesktop.sssd.infopipe.conf +%{_datadir}/dbus-1/system.d/org.freedesktop.sssd.infopipe.conf %{_datadir}/dbus-1/system-services/org.freedesktop.sssd.infopipe.service %{_libdir}/libsss_sudo.so* @@ -430,7 +425,6 @@ done %{_libdir}/libipa_hbac.so.* %{_libdir}/%{name}/modules/libsss_autofs.so %{_libdir}/libsss_nss_idmap.so.* -%{_libdir}/libsss_simpleifp.so.* %{_libdir}/libsss_certmap.so.* %{_libdir}/libnfsidmap/sss.so %dir %{_libdir}/samba/idmap @@ -455,10 +449,6 @@ done %{_includedir}/sss_nss_idmap.h %{_libdir}/libsss_nss_idmap.so %{_libdir}/pkgconfig/sss_nss_idmap.pc -%{_includedir}/sss_sifp.h -%{_includedir}/sss_sifp_dbus.h -%{_libdir}/libsss_simpleifp.so -%{_libdir}/pkgconfig/sss_simpleifp.pc %{_includedir}/sss_certmap.h %{_libdir}/libsss_certmap.so %{_libdir}/pkgconfig/sss_certmap.pc @@ -535,6 +525,9 @@ fi %systemd_postun_with_restart sssd.service %changelog +* Wed Jul 19 2023 zhengxiaoxiao - 2.9.1-1 +- update to 2.9.1 + * Tue Mar 28 2023 jiangjixiang - 2.8.2-5 - fix pid wrapping in sss_cli_check_socket