From 8222ea8b56b430a62199ca77ff2a4036040bc046 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
Date: Wed, 31 Jan 2024 10:45:37 +0100
Subject: [PATCH] Fix the build with Samba 4.20

Guenther
---
 0002-Fix-the-build-with-Samba-4.20.patch | 25 ++++++++++++++++++++++++
 sssd.spec                                |  6 +++++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 0002-Fix-the-build-with-Samba-4.20.patch

diff --git a/0002-Fix-the-build-with-Samba-4.20.patch b/0002-Fix-the-build-with-Samba-4.20.patch
new file mode 100644
index 0000000..02b8485
--- /dev/null
+++ b/0002-Fix-the-build-with-Samba-4.20.patch
@@ -0,0 +1,25 @@
+From 6b0cbea2f643269c5af6333b59979de9c0ad6ce5 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
+Date: Wed, 31 Jan 2024 10:42:40 +0100
+Subject: [PATCH] Fix the build with Samba 4.20
+
+Guenther
+---
+ src/external/samba.m4 | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/external/samba.m4 b/src/external/samba.m4
+index 49c6db8d2..5ab0e7527 100644
+--- a/src/external/samba.m4
++++ b/src/external/samba.m4
+@@ -58,7 +58,7 @@ with argument --without-samba
+         SAVE_CFLAGS=$CFLAGS
+         SAVE_LIBS=$LIBS
+         CFLAGS="$CFLAGS $SMBCLIENT_CFLAGS $NDR_NBT_CFLAGS $NDR_KRB5PAC_CFLAGS"
+-        LIBS="$LIBS -L${sambalibdir} -lidmap-samba4 -Wl,-rpath ${sambalibdir}"
++        LIBS="$LIBS -L${sambalibdir} -lidmap-private-samba -Wl,-rpath ${sambalibdir}"
+         AC_RUN_IFELSE(
+             [AC_LANG_SOURCE([
+ #include <stdlib.h>
+--
+2.43.0
diff --git a/sssd.spec b/sssd.spec
index 1d60bf5..90d1f8d 100644
--- a/sssd.spec
+++ b/sssd.spec
@@ -43,7 +43,7 @@
 
 Name: sssd
 Version: 2.9.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: System Security Services Daemon
 License: GPL-3.0-or-later
 URL: https://github.com/SSSD/sssd/
@@ -51,6 +51,7 @@ Source0: https://github.com/SSSD/sssd/releases/download/2.9.4/sssd-2.9.4.tar.gz
 
 ### Patches ###
 Patch0001: 0001-ENUMERATION-conditional-build-of-enumeration-support.patch
+Patch0002: 0002-Fix-the-build-with-Samba-4.20.patch
 
 ### Dependencies ###
 
@@ -1064,6 +1065,9 @@ fi
 %systemd_postun_with_restart sssd.service
 
 %changelog
+* Wed Jan 31 2024 Guenther Deschner <gdeschner@redhat.com> - 2.9.4-4
+- Fix the build with Samba 4.20
+
 * Thu Jan 18 2024 Alexey Tikhonov <atikhono@redhat.com> - 2.9.4-3
 - Disable enumeration support for IPA and AD providers.
   Deprecation was announced in F39 release notes: