Import from AL9.5 beta

2024-11-12 16:36:44 +03:00 · 2024-11-12 16:36:44 +03:00 · 54f2a43d9a
commit 54f2a43d9a
parent a0462df6ec
9 changed files with 422 additions and 1917 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,2 @@
-SOURCES/samba-4.19.4.tar.xz
+SOURCES/samba-4.20.2.tar.xz
 SOURCES/samba-pubkey_AA99442FB680B620.gpg
--- a/.samba.metadata
+++ b/.samba.metadata
@ -1,2 +1,2 @@
-6a164128df94dd89e785ca9f42d7be5714f16bed SOURCES/samba-4.19.4.tar.xz
+607bea15c2306b165610ebe3f617f1b29ef7f133 SOURCES/samba-4.20.2.tar.xz
 971f563c447eda8d144d6c9e743cd0f0488c0d9e SOURCES/samba-pubkey_AA99442FB680B620.gpg
--- a/SOURCES/101-orabug36371906-s3-passdb-fix-memleak-in-pdb_tdb.patch
+++ b/SOURCES/101-orabug36371906-s3-passdb-fix-memleak-in-pdb_tdb.patch
@ -1,42 +0,0 @@
-From 18913d384edb8c49c69501fd6db5511312614594 Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@samba.org>
-Date: Fri, 27 Oct 2023 12:09:53 +0200
-Subject: [PATCH] s3:passdb: Do not leak memory in pdb_tdb
-
-==19938==ERROR: LeakSanitizer: detected memory leaks
-
-Direct leak of 77 byte(s) in 1 object(s) allocated from:
-    #0 0x7f7d482841f8 in strdup (/lib64/libasan.so.8+0x841f8) (BuildId: 3e1694ad218c99a8b1b69231666a27df63cf19d0)
-    #1 0x7f7d47204846  (bin/shared/libsamba-util.so.0+0x4c846) (BuildId: 43b084eb9013442ac68eb1fc17649f142cbb0f94)
-    #2 0x7f7d40b1d97a in pdb_init_tdbsam ../../source3/passdb/pdb_tdb.c:1361
-    #3 0x7f7d4715f266  (bin/shared/libsamba-passdb.so.0+0x76266) (BuildId: 13d2858e2217592a22a4ee9203fef759d52df733)
-    #4 0x7f7d4715f57a  (bin/shared/libsamba-passdb.so.0+0x7657a) (BuildId: 13d2858e2217592a22a4ee9203fef759d52df733)
-    #5 0x7f7d47163700  (bin/shared/libsamba-passdb.so.0+0x7a700) (BuildId: 13d2858e2217592a22a4ee9203fef759d52df733)
-    #6 0x55a9177d3853 in main ../../source3/smbd/server.c:1928
-    #7 0x7f7d434281af in __libc_start_call_main ../sysdeps/nptl/libc_start_call_main.h:58
-
-Signed-off-by: Andreas Schneider <asn@samba.org>
-Reviewed-by: Volker Lendecke <vl@samba.org>
-
-Orabug: 36371906
-Signed-off-by: Shaleen Bathla <shaleen.bathla@oracle.com>
-Reviewed-by: Laurence Rochfort <laurence.rochfort@oracle.com>
---
- source3/passdb/pdb_tdb.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/source3/passdb/pdb_tdb.c b/source3/passdb/pdb_tdb.c
-index 4c578f8069d..f9ba193df3b 100644
--- a/source3/passdb/pdb_tdb.c
-+++ b/source3/passdb/pdb_tdb.c
-@@ -1346,6 +1346,9 @@ static NTSTATUS pdb_init_tdbsam(struct pdb_methods **pdb_method, const char *loc
- 		}
- 		pfile = tdbfile;
- 	}
-+
-+	/* Do not leak memory if the init function is called more than once */
-+	SAFE_FREE(tdbsam_filename);
- 	tdbsam_filename = SMB_STRDUP(pfile);
- 	if (!tdbsam_filename) {
- 		return NT_STATUS_NO_MEMORY;
--
--- a/SOURCES/102-orabug36566309-s3-winbindd-winbindd_pam-fix-leak-in-extract_pac_vrfy_sigs.patch
+++ b/SOURCES/102-orabug36566309-s3-winbindd-winbindd_pam-fix-leak-in-extract_pac_vrfy_sigs.patch
@ -1,80 +0,0 @@
-From 48493735e2d2091740fe784cf07a4258dfc0b512 Mon Sep 17 00:00:00 2001
-From: Shaleen Bathla <shaleen.bathla@oracle.com>
-Date: Wed, 10 Apr 2024 18:31:39 +0530
-Subject: [PATCH] s3: winbindd: winbindd_pam: fix leak in extract_pac_vrfy_sigs
-
-Add missing free for entry variable and its members : key and principal
-Found definite memory leaks via valgrind as shown below.
-
-Leak 1 :
-==1686== 76,800 bytes in 2,400 blocks are definitely lost in loss record 432 of 433
-==1686==    at 0x4C38185: malloc (vg_replace_malloc.c:431)
-==1686==    by 0x79CBFED: krb5int_c_copy_keyblock_contents (keyblocks.c:101)
-==1686==    by 0x621CFA3: krb5_mkt_get_next (kt_memory.c:500)
-==1686==    by 0x141186: extract_pac_vrfy_sigs (winbindd_pam.c:3384)
-==1686==    by 0x141186: winbindd_pam_auth_pac_verify (winbindd_pam.c:3434)
-==1686==    by 0x17ED21: winbindd_pam_auth_crap_send (winbindd_pam_auth_crap.c:68)
-==1686==    by 0x127F45: process_request_send (winbindd.c:502)
-==1686==    by 0x127F45: winbind_client_request_read (winbindd.c:749)
-==1686==    by 0x124AAF: wb_req_read_done (wb_reqtrans.c:126)
-==1686==    by 0x66D4706: tevent_common_invoke_fd_handler (tevent_fd.c:142)
-==1686==    by 0x66DAF4E: epoll_event_loop (tevent_epoll.c:737)
-==1686==    by 0x66DAF4E: epoll_event_loop_once (tevent_epoll.c:938)
-==1686==    by 0x66D8F5A: std_event_loop_once (tevent_standard.c:110)
-==1686==    by 0x66D39B4: _tevent_loop_once (tevent.c:823)
-==1686==    by 0x1232F3: main (winbindd.c:1718)
-
-Leak 2 :
-==1686==    at 0x4C38185: malloc (vg_replace_malloc.c:431)
-==1686==    by 0x62255E4: krb5_copy_principal (copy_princ.c:38)
-==1686==    by 0x621D003: krb5_mkt_get_next (kt_memory.c:503)
-==1686==    by 0x141186: extract_pac_vrfy_sigs (winbindd_pam.c:3384)
-==1686==    by 0x141186: winbindd_pam_auth_pac_verify (winbindd_pam.c:3434)
-==1686==    by 0x17ED21: winbindd_pam_auth_crap_send (winbindd_pam_auth_crap.c:68)
-==1686==    by 0x127F45: process_request_send (winbindd.c:502)
-==1686==    by 0x127F45: winbind_client_request_read (winbindd.c:749)
-==1686==    by 0x124AAF: wb_req_read_done (wb_reqtrans.c:126)
-==1686==    by 0x66D4706: tevent_common_invoke_fd_handler (tevent_fd.c:142)
-==1686==    by 0x66DAF4E: epoll_event_loop (tevent_epoll.c:737)
-==1686==    by 0x66DAF4E: epoll_event_loop_once (tevent_epoll.c:938)
-==1686==    by 0x66D8F5A: std_event_loop_once (tevent_standard.c:110)
-==1686==    by 0x66D39B4: _tevent_loop_once (tevent.c:823)
-==1686==    by 0x1232F3: main (winbindd.c:1718)
-
-Signed-off-by: Shaleen Bathla <shaleen.bathla@oracle.com>
-Reviewed-by: Andrew Bartlett <abartlet@samba.org>
-Reviewed-by: Andreas Schneider <asn@samba.org>
-
-Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
-Autobuild-Date(master): Tue Apr 16 10:22:51 UTC 2024 on atb-devel-224
-
-Orabug: 36566309
-Signed-off-by: Shaleen Bathla <shaleen.bathla@oracle.com>
-Reviewed-by: Laurence Rochfort <laurence.rochfort@oracle.com>
---
- source3/winbindd/winbindd_pam.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/source3/winbindd/winbindd_pam.c b/source3/winbindd/winbindd_pam.c
-index 6c890c8acd5..e7d64189b7e 100644
--- a/source3/winbindd/winbindd_pam.c
-+++ b/source3/winbindd/winbindd_pam.c
-@@ -3433,12 +3433,17 @@ static NTSTATUS extract_pac_vrfy_sigs(TALLOC_CTX *mem_ctx, DATA_BLOB pac_blob,
- 					     NULL, /* client_principal */
- 					     0, /* tgs_authtime */
- 					     p_pac_data);
-+		(void)smb_krb5_kt_free_entry(krbctx, &entry);
- 		if (NT_STATUS_IS_OK(status)) {
- 			break;
- 		}
-		k5ret = smb_krb5_kt_free_entry(krbctx, &entry);
- 		k5ret = krb5_kt_next_entry(krbctx, keytab, &entry, &cursor);
- 	}
-+	if (k5ret != 0 && k5ret != KRB5_KT_END) {
-+		DEBUG(1, ("Failed to get next entry: %s\n",
-+			  error_message(k5ret)));
-+		(void)smb_krb5_kt_free_entry(krbctx, &entry);
-+	}
- 
- 	k5ret = krb5_kt_end_seq_get(krbctx, keytab, &cursor);
- 	if (k5ret) {
--- a/SOURCES/redhat-4.20.2.patch
+++ b/SOURCES/redhat-4.20.2.patch
@ -0,0 +1,102 @@
+From dddbbec2cb10b05a6ec3b4f1fcc877d60a44080a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Pavel=20Filipensk=C3=BD?= <pfilipensky@samba.org>
+Date: Thu, 4 Jul 2024 11:08:03 +0200
+Subject: [PATCH 1/2] .gitlab-ci-main.yml: Add safe.directory '*'
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is to fix the error when pushing to personal gitlab repo:
+
+2024-07-04 08:16:05,460 Running: 'git clone --recursive --shared /builds/pfilipen/samba /builds/samba-testbase/master' in '/builds/pfilipen/samba'
+Cloning into '/builds/samba-testbase/master'...
+fatal: detected dubious ownership in repository at '/builds/pfilipen/samba/.git'
+To add an exception for this directory, call:
+	git config --global --add safe.directory /builds/pfilipen/samba/.git
+fatal: Could not read from remote repository.
+
+Instead of adding more and more explicit repositories
+we should just allow any, we're in an isolated environment...
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=15660
+
+Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>
+Signed-off-by: Pavel Filipenský <pfilipensky@samba.org>
+Signed-off-by: Stefan Metzmacher <metze@samba.org>
+Reviewed-by: Andreas Schneider <asn@samba.org>
+
+Autobuild-User(master): Stefan Metzmacher <metze@samba.org>
+Autobuild-Date(master): Wed Jul 10 10:35:00 UTC 2024 on atb-devel-224
+
+(cherry picked from commit 3a21b7d9a4e7e9814d0be8c0ebf72b9821a5dc36)
+---
+ .gitlab-ci-main.yml | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
+index face2103327..08865ca2c42 100644
+--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
+@@ -146,8 +146,7 @@ include:
+     - ccache -z -M 500M
+     - ccache -s
+       # We are already running .gitlab-ci directives from this repo, remove additional checks that break our CI
+-    - git config --global --add safe.directory `pwd`
+-    - git config --global --add safe.directory /builds/samba-team/devel/samba/.git
+    - git config --global --add safe.directory '*'
+   after_script:
+     - mount
+     - df -h
+-- 
+2.45.2
+
+
+From 1c69964d34d2cf66532b23ffde76a839a65b0db2 Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@samba.org>
+Date: Fri, 12 Jul 2024 14:18:26 +0200
+Subject: [PATCH 2/2] s3:printing: Allow to run samba-bgqd as a standalone
+ systemd service
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=15683
+
+Signed-off-by: Andreas Schneider <asn@samba.org>
+Reviewed-by: Alexander Bokovoy <ab@samba.org>
+(cherry picked from commit 0a532378322661b23b3393eb2ebde29402a16e62)
+
+Autobuild-User(v4-20-test): Jule Anger <janger@samba.org>
+Autobuild-Date(v4-20-test): Tue Jul 23 08:56:24 UTC 2024 on atb-devel-224
+
+(cherry picked from commit 4cf9af9186d7829f11bd07c7d6e526a51dcf0d61)
+---
+ source3/printing/samba-bgqd.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/source3/printing/samba-bgqd.c b/source3/printing/samba-bgqd.c
+index 59ed0cc40db..9560fcf9e35 100644
+--- a/source3/printing/samba-bgqd.c
+++ b/source3/printing/samba-bgqd.c
+@@ -253,7 +253,9 @@ int main(int argc, const char *argv[])
+ 	log_stdout = (debug_get_log_type() == DEBUG_STDOUT);
+ 
+ 	/* main process will notify systemd */
+-	daemon_sd_notifications(false);
+	if (ready_signal_fd != -1 || watch_fd != -1) {
+		daemon_sd_notifications(false);
+	}
+ 
+ 	if (!cmdline_daemon_cfg->fork) {
+ 		daemon_status(progname, "Starting process ... ");
+@@ -325,6 +327,10 @@ int main(int argc, const char *argv[])
+ 		goto done;
+ 	}
+ 
+	if (!cmdline_daemon_cfg->fork) {
+		daemon_ready(progname);
+	}
+
+ 	if (ready_signal_fd != -1) {
+ 		pid_t pid = getpid();
+ 		ssize_t written;
+-- 
+2.45.2
+
--- a/SOURCES/samba-4.19-redhat.patch
+++ b/SOURCES/samba-4.19-redhat.patch
--- a/SOURCES/samba-4.19.4.tar.asc
+++ b/SOURCES/samba-4.19.4.tar.asc
@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEgfXigyvSVFoYl7cTqplEL7aAtiAFAmWcCFAACgkQqplEL7aA
-tiDKSBAAuWA9jT6xCfFACIlme7DbEoUm/Bsbf+GM2Somd3pgajekiNxo7CsW9Xub
-Vmpj0Q5OKiri81XTqA8LlqMCBliqfw/rnP48kCH0YqXzjqD6aYuwmk0Q4G3wWBTJ
-2ZT/wOpbM3YooFfE9Iffz6uNgAiQ/8kpBt2m6Zzfy8n1ThfztyGAGaSmrUWxgUlq
-XjRjtgTw4isZBm+RzCFSGuPxvWvxRlfD5JCe2gc221rI3kbaQE2GSxdZ6D0635Ln
-iy64SLIAKkQCrrFFckudSCCLKgLNdIClEwzamhhCbmCxnWMDufzN+BQZhq3axQ+x
-svPfZqltVSQztr4nPGvKdebtVLL2Zyf/LtXWQP/s66quHlHFoEAC7MuD6tEMQVar
-JQUCN51Gs0Yk12iReQFm6/Uo35aPAlai1e2uOkNzS5FnagRObYt6FYeQripks4I8
-ZW5VvF4cE0zqdjrlG+Ttqmpbj7i6AUJj9wSbrEOFDUhTL+QPPOfJ05yr1BHmS6nJ
-vuuUs+ei/DnYEFS91P81h5NuOdpRHIBTG6LUOLz5KOoNdIgvzjD/Ugyscj4AFTBo
-+NTG9nNr6gkLV/6dxDRR2/sbU6P+FZBL+JVUoDR7XQ7oHG7sFV+/8Dtu8RivEw++
-1sNGqxvGkwu7JunMkJO5YZRwXi81v3nmHkWKgb0+52iYXgmdesY=
-=kOPP
-----END PGP SIGNATURE-----
--- a/SOURCES/samba-4.20.2.tar.asc
+++ b/SOURCES/samba-4.20.2.tar.asc
@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEgfXigyvSVFoYl7cTqplEL7aAtiAFAmZy684ACgkQqplEL7aA
+tiDXDw/+KleJ11LLq5ZlXMlj11niRCETErY8cuoZ9VX04lfRwRBnplpKKLSQuFit
+5HeY5ED65DhbpGzPfLPx7xOw4wyFc/bXhHPTgF3Ybj8TKkEcaMmkpD3V8FPa4NAt
+vNZ3alLQLP//kgRXnqeV9pfa4slx17G6WeBLbpd8b4SbgPMgokJt7hL3nWfBrFE9
+p6B+TKZcwfoCn9ufz1UxMpBFtpSK0yF0S7CQcdv3JrBNIYhULuXbnAnLCHcH1RqW
+xreoxZPnMx+SrYb0iHyKbkMsDujCqBKm9CyS13Yt9DjI49lv0pBwQFnaqtR4Xm/D
+BU2XIWLLInUecxtUOBtsa046h55fLQPgkb+WYob++iA9r91y4JAZIiAxdVrNLsxR
+BiFUxkL7EPtyptT84xNjpQ3CTZuw8tlHu/sJ1/XHRUFMtRGjiMqJp7ULsVQDfwET
+7T+HHrVHNstddb9A6WfM8qSItoMfGUlYyzTQ2d3OmrbGRnB0qf+zg9DI+vXv5Itx
+M23we8ljSadCnc/kqz3Z6gefI538WWDnbXIljRqDxuzwaSXhMd4heG+xIAAO0Of5
+ziyCVQ/n8gnyXQmC82Xlebc3mYki8UoyYWdbVNJZAOEo/LuBql1OkjOhkhMcBDmr
+qvD6f+0+MA4nydmVhI/q/pmo7nAUD3SAxmRKrVTwjpjcAnZ4IGw=
+=CGiK
+-----END PGP SIGNATURE-----
--- a/SPECS/samba.spec
+++ b/SPECS/samba.spec
@ -57,7 +57,7 @@

 # ppc64le excluded pending resolution of https://gcc.gnu.org/bugzilla/show_bug.cgi?id=104172
 #%%ifarch aarch64 ppc64le s390x x86_64
-%ifarch aarch64 s390x x86_64
+%ifarch aarch64 s390x x86_64 riscv64
 %bcond_without vfs_cephfs
 %bcond_without ceph_mutex
 %else
@ -80,7 +80,7 @@

 %if 0%{?fedora}

-%ifarch aarch64 ppc64le s390x x86_64
+%ifarch aarch64 ppc64le s390x x86_64 riscv64
 %bcond_without vfs_glusterfs
 %else
 %bcond_with vfs_glusterfs
@ -109,7 +109,7 @@
 # Build vfs_io_uring module by default on 64bit Fedora
 %if 0%{?fedora} || 0%{?rhel} >= 8

-%ifarch aarch64 ppc64le s390x x86_64
+%ifarch aarch64 ppc64le s390x x86_64 riscv64
 %bcond_without vfs_io_uring
 %else
 %bcond_with vfs_io_uring
@ -139,15 +139,15 @@
 %endif

 %if 0%{?fedora} || 0%{?rhel} >= 9
-%bcond_with gpupdate
+%bcond_without gpupdate
 %else
 %bcond_with gpupdate
 %endif

 %define samba_requires_eq()  %(LC_ALL="C" echo '%*' | xargs -r rpm -q --qf 'Requires: %%{name} = %%{epoch}:%%{version}\\n' | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not")

-%global samba_version 4.19.4
-%global baserelease 105
+%global samba_version 4.20.2
+%global baserelease 2
 # This should be rc1 or %%nil
 %global pre_release %nil

@ -164,7 +164,7 @@
 %global libdcerpc_so_version 0
 %global libndr_krb5pac_so_version 0
 %global libndr_nbt_so_version 0
-%global libndr_so_version 3
+%global libndr_so_version 4
 %global libndr_standard_so_version 0
 %global libnetapi_so_version 1
 %global libsamba_credentials_so_version 1
@ -180,10 +180,10 @@
 %global libsmbclient_so_version 0
 %global libwbclient_so_version 0

-%global talloc_version 2.4.1
-%global tdb_version 1.4.9
-%global tevent_version 0.15.0
-%global ldb_version 2.8.0
+%global talloc_version 2.4.2
+%global tdb_version 1.4.10
+%global tevent_version 0.16.1
+%global ldb_version 2.9.1

 %global required_mit_krb5 1.20.1

@ -238,11 +238,15 @@ Source18:       samba-winbind-systemd-sysusers.conf
 Source201:      README.downgrade
 Source202:      samba.abignore

-# Backport bug fixes to https://gitlab.com/samba-redhat/samba/-/tree/v4-19-redhat
-# This will give us CI and makes it easy to generate patchsets.
+# Patch0 is created using:
 #
-# Generate the patchset using: git format-patch -l1 --stdout -N > samba-4.19-redhat.patch
-Patch0:        samba-4.19-redhat.patch
+# git clone git@gitlab.com:samba-redhat/samba.git
+# cd samba
+# git checkout v4-20-redhat
+# git format-patch --stdout -l1 --no-renames -N > redhat-4.20.2.patch
+# where N is number of commits
+
+Patch0:        redhat-4.20.2.patch

 Requires(pre): %{name}-common = %{samba_depver}
 Requires: %{name}-common = %{samba_depver}
@ -338,7 +342,7 @@ BuildRequires: zlib-devel >= 1.2.3

 BuildRequires: pkgconfig(libsystemd)

-%ifnarch i686
+%ifnarch i686 riscv64
 %if 0%{?fedora} >= 37
 BuildRequires: mold
 %endif
@ -368,7 +372,7 @@ BuildRequires: python3-etcd
 %endif

 %if %{with gpupdate}
-BuildRequires: cepces-certmonger
+BuildRequires: cepces-certmonger >= 0.3.8
 %endif

 # pidl requirements
@ -1227,10 +1231,8 @@ xzcat %{SOURCE0} | gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} -
 %endif
 %autosetup -n samba-%{version}%{pre_release} -p1

-# Ensure we rely on GnuTLS and do not build any other crypto code shipping with
-# the sources.
-rm -rf third_party/{aesni-intel,heimdal}
-rm -f lib/crypto/{aes,rijndael}*.c
+# Make sure we do not build with heimdal code
+rm -rfv third_party/heimdal

 %build
 %if %{with includelibs}
@ -1280,7 +1282,7 @@ export python_LDFLAGS="$(echo %{__global_ldflags} | sed -e 's/-Wl,-z,defs//g')"
 # Use the mold linker if possible
 export python_LDFLAGS="$(echo %{__global_ldflags} | sed -e 's/-Wl,-z,defs//g')"

-%ifnarch i686
+%ifnarch i686 riscv64
 %if 0%{?fedora} >= 37
 export LDFLAGS="%{__global_ldflags} -fuse-ld=mold"
 export python_LDFLAGS="$(echo ${LDFLAGS} | sed -e 's/-Wl,-z,defs//g')"
@ -1520,14 +1522,17 @@ export WINBINDD_DONT_LOG_STDOUT=1
 %endif

 %post
+%systemd_post samba-bgqd.service
 %systemd_post smb.service
 %systemd_post nmb.service

 %preun
+%systemd_preun samba-bgqd.service
 %systemd_preun smb.service
 %systemd_preun nmb.service

 %postun
+%systemd_postun_with_restart samba-bgqd.service
 %systemd_postun_with_restart smb.service
 %systemd_postun_with_restart nmb.service

@ -1592,9 +1597,9 @@ fi
 %if %{with libwbclient}
 %pre -n libwbclient
 if [ $1 -gt 1 ] ; then
-    rm -rf %{_libdir}/samba/wbclient/
-    rm -f /etc/alternatives/libwbclient.so*
-    rm -f /var/lib/alternatives/libwbclient.so*
+    rm -rf %{_libdir}/samba/wbclient/ 2>/dev/null
+    rm -f /etc/alternatives/libwbclient.so* 2>/dev/null
+    rm -f /var/lib/alternatives/libwbclient.so* 2>/dev/null
 fi
 %{?ldconfig}
 #endif {with libwbclient}
@ -1652,8 +1657,6 @@ fi

 ### SAMBA
 %files
-%license COPYING
-%doc README.md WHATSNEW.txt
 %doc examples/autofs examples/LDAP examples/misc
 %doc examples/printer-accounting examples/printing
 %doc packaging/README.downgrade
@ -1663,7 +1666,7 @@ fi
 %{_sbindir}/smbd
 %if %{with dc} || %{with testsuite}
 # This is only used by vfs_dfs_samba4
-%{_libdir}/samba/libdfs-server-ad-samba4.so
+%{_libdir}/samba/libdfs-server-ad-private-samba.so
 %endif
 %dir %{_libdir}/samba/auth
 %{_libdir}/samba/auth/unix.so
@ -1725,6 +1728,7 @@ fi

 %{_unitdir}/nmb.service
 %{_unitdir}/smb.service
+%{_unitdir}/samba-bgqd.service
 %dir %{_sysconfdir}/openldap/schema
 %config %{_sysconfdir}/openldap/schema/samba.schema
 %config(noreplace) %{_sysconfdir}/pam.d/samba
@ -1801,6 +1805,7 @@ fi
 %{_bindir}/smbspool
 %{_bindir}/smbtar
 %{_bindir}/smbtree
+%{_bindir}/wspsearch
 %dir %{_libexecdir}/samba
 %ghost %{_libexecdir}/samba/cups_backend_smb
 %{_mandir}/man1/dbwrap_tool.1*
@ -1821,6 +1826,7 @@ fi
 %{_mandir}/man1/smbget.1*
 %{_mandir}/man1/smbtar.1*
 %{_mandir}/man1/smbtree.1*
+%{_mandir}/man1/wspsearch.1*
 %{_mandir}/man7/traffic_learner.7.*
 %{_mandir}/man7/traffic_replay.7.*
 %{_mandir}/man8/cifsdd.8.*
@ -1872,86 +1878,86 @@ fi
 %{_libdir}/libtevent-util.so.%{libtevent_util_so_version}*

 %dir %{_libdir}/samba
-%{_libdir}/samba/libCHARSET3-samba4.so
-%{_libdir}/samba/libMESSAGING-SEND-samba4.so
-%{_libdir}/samba/libMESSAGING-samba4.so
-%{_libdir}/samba/libaddns-samba4.so
-%{_libdir}/samba/libads-samba4.so
-%{_libdir}/samba/libasn1util-samba4.so
-%{_libdir}/samba/libauth-samba4.so
-%{_libdir}/samba/libauthkrb5-samba4.so
-%{_libdir}/samba/libcli-cldap-samba4.so
-%{_libdir}/samba/libcli-ldap-common-samba4.so
-%{_libdir}/samba/libcli-ldap-samba4.so
-%{_libdir}/samba/libcli-nbt-samba4.so
-%{_libdir}/samba/libcli-smb-common-samba4.so
-%{_libdir}/samba/libcli-spoolss-samba4.so
-%{_libdir}/samba/libcliauth-samba4.so
-%{_libdir}/samba/libclidns-samba4.so
-%{_libdir}/samba/libcluster-samba4.so
-%{_libdir}/samba/libcmdline-contexts-samba4.so
-%{_libdir}/samba/libcommon-auth-samba4.so
-%{_libdir}/samba/libctdb-event-client-samba4.so
-%{_libdir}/samba/libdbwrap-samba4.so
-%{_libdir}/samba/libdcerpc-pkt-auth-samba4.so
-%{_libdir}/samba/libdcerpc-samba-samba4.so
-%{_libdir}/samba/libevents-samba4.so
-%{_libdir}/samba/libflag-mapping-samba4.so
-%{_libdir}/samba/libgenrand-samba4.so
-%{_libdir}/samba/libgensec-samba4.so
-%{_libdir}/samba/libgpext-samba4.so
-%{_libdir}/samba/libgpo-samba4.so
-%{_libdir}/samba/libgse-samba4.so
-%{_libdir}/samba/libhttp-samba4.so
-%{_libdir}/samba/libinterfaces-samba4.so
-%{_libdir}/samba/libiov-buf-samba4.so
-%{_libdir}/samba/libkrb5samba-samba4.so
-%{_libdir}/samba/libldbsamba-samba4.so
-%{_libdir}/samba/liblibcli-lsa3-samba4.so
-%{_libdir}/samba/liblibcli-netlogon3-samba4.so
-%{_libdir}/samba/liblibsmb-samba4.so
-%{_libdir}/samba/libmessages-dgm-samba4.so
-%{_libdir}/samba/libmessages-util-samba4.so
-%{_libdir}/samba/libmscat-samba4.so
-%{_libdir}/samba/libmsghdr-samba4.so
-%{_libdir}/samba/libmsrpc3-samba4.so
-%{_libdir}/samba/libndr-samba-samba4.so
-%{_libdir}/samba/libndr-samba4.so
-%{_libdir}/samba/libnet-keytab-samba4.so
-%{_libdir}/samba/libnetif-samba4.so
-%{_libdir}/samba/libnpa-tstream-samba4.so
-%{_libdir}/samba/libposix-eadb-samba4.so
-%{_libdir}/samba/libprinter-driver-samba4.so
-%{_libdir}/samba/libprinting-migrate-samba4.so
-%{_libdir}/samba/libreplace-samba4.so
-%{_libdir}/samba/libregistry-samba4.so
-%{_libdir}/samba/libsamba-cluster-support-samba4.so
-%{_libdir}/samba/libsamba-debug-samba4.so
-%{_libdir}/samba/libsamba-modules-samba4.so
-%{_libdir}/samba/libsamba-security-samba4.so
-%{_libdir}/samba/libsamba-sockets-samba4.so
-%{_libdir}/samba/libsamba3-util-samba4.so
-%{_libdir}/samba/libsamdb-common-samba4.so
-%{_libdir}/samba/libsecrets3-samba4.so
-%{_libdir}/samba/libserver-id-db-samba4.so
-%{_libdir}/samba/libserver-role-samba4.so
-%{_libdir}/samba/libsmb-transport-samba4.so
-%{_libdir}/samba/libsmbclient-raw-samba4.so
-%{_libdir}/samba/libsmbd-base-samba4.so
-%{_libdir}/samba/libsmbd-shim-samba4.so
-%{_libdir}/samba/libsmbldaphelper-samba4.so
-%{_libdir}/samba/libstable-sort-samba4.so
-%{_libdir}/samba/libsys-rw-samba4.so
-%{_libdir}/samba/libsocket-blocking-samba4.so
-%{_libdir}/samba/libtalloc-report-printf-samba4.so
-%{_libdir}/samba/libtalloc-report-samba4.so
-%{_libdir}/samba/libtdb-wrap-samba4.so
-%{_libdir}/samba/libtime-basic-samba4.so
-%{_libdir}/samba/libtorture-samba4.so
-%{_libdir}/samba/libtrusts-util-samba4.so
-%{_libdir}/samba/libutil-reg-samba4.so
-%{_libdir}/samba/libutil-setid-samba4.so
-%{_libdir}/samba/libutil-tdb-samba4.so
+%{_libdir}/samba/libCHARSET3-private-samba.so
+%{_libdir}/samba/libMESSAGING-SEND-private-samba.so
+%{_libdir}/samba/libMESSAGING-private-samba.so
+%{_libdir}/samba/libaddns-private-samba.so
+%{_libdir}/samba/libads-private-samba.so
+%{_libdir}/samba/libasn1util-private-samba.so
+%{_libdir}/samba/libauth-private-samba.so
+%{_libdir}/samba/libauthkrb5-private-samba.so
+%{_libdir}/samba/libcli-cldap-private-samba.so
+%{_libdir}/samba/libcli-ldap-common-private-samba.so
+%{_libdir}/samba/libcli-ldap-private-samba.so
+%{_libdir}/samba/libcli-nbt-private-samba.so
+%{_libdir}/samba/libcli-smb-common-private-samba.so
+%{_libdir}/samba/libcli-spoolss-private-samba.so
+%{_libdir}/samba/libcliauth-private-samba.so
+%{_libdir}/samba/libclidns-private-samba.so
+%{_libdir}/samba/libcluster-private-samba.so
+%{_libdir}/samba/libcmdline-contexts-private-samba.so
+%{_libdir}/samba/libcommon-auth-private-samba.so
+%{_libdir}/samba/libctdb-event-client-private-samba.so
+%{_libdir}/samba/libdbwrap-private-samba.so
+%{_libdir}/samba/libdcerpc-pkt-auth-private-samba.so
+%{_libdir}/samba/libdcerpc-samba-private-samba.so
+%{_libdir}/samba/libevents-private-samba.so
+%{_libdir}/samba/libflag-mapping-private-samba.so
+%{_libdir}/samba/libgenrand-private-samba.so
+%{_libdir}/samba/libgensec-private-samba.so
+%{_libdir}/samba/libgpext-private-samba.so
+%{_libdir}/samba/libgpo-private-samba.so
+%{_libdir}/samba/libgse-private-samba.so
+%{_libdir}/samba/libhttp-private-samba.so
+%{_libdir}/samba/libinterfaces-private-samba.so
+%{_libdir}/samba/libiov-buf-private-samba.so
+%{_libdir}/samba/libkrb5samba-private-samba.so
+%{_libdir}/samba/libldbsamba-private-samba.so
+%{_libdir}/samba/liblibcli-lsa3-private-samba.so
+%{_libdir}/samba/liblibcli-netlogon3-private-samba.so
+%{_libdir}/samba/liblibsmb-private-samba.so
+%{_libdir}/samba/libmessages-dgm-private-samba.so
+%{_libdir}/samba/libmessages-util-private-samba.so
+%{_libdir}/samba/libmscat-private-samba.so
+%{_libdir}/samba/libmsghdr-private-samba.so
+%{_libdir}/samba/libmsrpc3-private-samba.so
+%{_libdir}/samba/libndr-samba-private-samba.so
+%{_libdir}/samba/libndr-samba4-private-samba.so
+%{_libdir}/samba/libnet-keytab-private-samba.so
+%{_libdir}/samba/libnetif-private-samba.so
+%{_libdir}/samba/libnpa-tstream-private-samba.so
+%{_libdir}/samba/libposix-eadb-private-samba.so
+%{_libdir}/samba/libprinter-driver-private-samba.so
+%{_libdir}/samba/libprinting-migrate-private-samba.so
+%{_libdir}/samba/libreplace-private-samba.so
+%{_libdir}/samba/libregistry-private-samba.so
+%{_libdir}/samba/libsamba-cluster-support-private-samba.so
+%{_libdir}/samba/libsamba-debug-private-samba.so
+%{_libdir}/samba/libsamba-modules-private-samba.so
+%{_libdir}/samba/libsamba-security-private-samba.so
+%{_libdir}/samba/libsamba-sockets-private-samba.so
+%{_libdir}/samba/libsamba3-util-private-samba.so
+%{_libdir}/samba/libsamdb-common-private-samba.so
+%{_libdir}/samba/libsecrets3-private-samba.so
+%{_libdir}/samba/libserver-id-db-private-samba.so
+%{_libdir}/samba/libserver-role-private-samba.so
+%{_libdir}/samba/libsmb-transport-private-samba.so
+%{_libdir}/samba/libsmbclient-raw-private-samba.so
+%{_libdir}/samba/libsmbd-base-private-samba.so
+%{_libdir}/samba/libsmbd-shim-private-samba.so
+%{_libdir}/samba/libsmbldaphelper-private-samba.so
+%{_libdir}/samba/libstable-sort-private-samba.so
+%{_libdir}/samba/libsys-rw-private-samba.so
+%{_libdir}/samba/libsocket-blocking-private-samba.so
+%{_libdir}/samba/libtalloc-report-printf-private-samba.so
+%{_libdir}/samba/libtalloc-report-private-samba.so
+%{_libdir}/samba/libtdb-wrap-private-samba.so
+%{_libdir}/samba/libtime-basic-private-samba.so
+%{_libdir}/samba/libtorture-private-samba.so
+%{_libdir}/samba/libtrusts-util-private-samba.so
+%{_libdir}/samba/libutil-reg-private-samba.so
+%{_libdir}/samba/libutil-setid-private-samba.so
+%{_libdir}/samba/libutil-tdb-private-samba.so

 %if %{without libwbclient}
 %{_libdir}/samba/libwbclient.so.*
@ -1966,9 +1972,9 @@ fi

 %if %{with includelibs}
 %{_libdir}/samba/libldb-*.so
-%{_libdir}/samba/libtalloc-samba4.so
-%{_libdir}/samba/libtdb-samba4.so
-%{_libdir}/samba/libtevent-samba4.so
+%{_libdir}/samba/libtalloc-private-samba.so
+%{_libdir}/samba/libtdb-private-samba.so
+%{_libdir}/samba/libtevent-private-samba.so

 %{_libdir}/samba/ldb/asq.so
 %{_libdir}/samba/ldb/ldb.so
@ -1987,6 +1993,8 @@ fi

 ### COMMON
 %files common
+%doc README.md WHATSNEW.txt
+%license COPYING
 %{_tmpfilesdir}/samba.conf
 %{_sysusersdir}/samba.conf
 %dir %{_sysconfdir}/logrotate.d/
@ -2011,7 +2019,7 @@ fi
 ### COMMON-LIBS
 %files common-libs
 # common libraries
-%{_libdir}/samba/libcmdline-samba4.so
+%{_libdir}/samba/libcmdline-private-samba.so

 %dir %{_libdir}/samba/ldb

@ -2056,6 +2064,7 @@ fi
 %endif
 %{_libexecdir}/samba/rpcd_spoolss
 %{_libexecdir}/samba/rpcd_winreg
+%{_libexecdir}/samba/rpcd_witness
 %{_mandir}/man8/samba-dcerpcd.8*

 ### DC
@ -2141,16 +2150,16 @@ fi
 %endif
 ### DC-LIBS
 %files dc-libs
-%{_libdir}/samba/libauth4-samba4.so
+%{_libdir}/samba/libauth4-private-samba.so

 %if %{with dc} || %{with testsuite}
-%{_libdir}/samba/libdb-glue-samba4.so
-%{_libdir}/samba/libpac-samba4.so
-%{_libdir}/samba/libprocess-model-samba4.so
-%{_libdir}/samba/libservice-samba4.so
+%{_libdir}/samba/libdb-glue-private-samba.so
+%{_libdir}/samba/libpac-private-samba.so
+%{_libdir}/samba/libprocess-model-private-samba.so
+%{_libdir}/samba/libservice-private-samba.so

 %if %{with testsuite}
-%{_libdir}/samba/libntvfs-samba4.so
+%{_libdir}/samba/libntvfs-private-samba.so
 %endif

 %dir %{_libdir}/samba/process_model
@ -2176,11 +2185,11 @@ fi
 %endif

 %{_libdir}/libdcerpc-server.so.*
-%{_libdir}/samba/libad-claims-samba4.so
-%{_libdir}/samba/libauthn-policy-util-samba4.so
-%{_libdir}/samba/libdsdb-module-samba4.so
-%{_libdir}/samba/libdsdb-garbage-collect-tombstones-samba4.so
-%{_libdir}/samba/libscavenge-dns-records-samba4.so
+%{_libdir}/samba/libad-claims-private-samba.so
+%{_libdir}/samba/libauthn-policy-util-private-samba.so
+%{_libdir}/samba/libdsdb-module-private-samba.so
+%{_libdir}/samba/libdsdb-garbage-collect-tombstones-private-samba.so
+%{_libdir}/samba/libscavenge-dns-records-private-samba.so

 ### DC-BIND
 %files dc-bind-dlz
@ -2254,6 +2263,7 @@ fi
 %{_includedir}/samba-4.0/samba/version.h
 %{_includedir}/samba-4.0/share.h
 %{_includedir}/samba-4.0/smb2_lease_struct.h
+%{_includedir}/samba-4.0/smb3posix.h
 %{_includedir}/samba-4.0/smbconf.h
 %{_includedir}/samba-4.0/smb_ldap.h
 %{_includedir}/samba-4.0/smbldap.h
@ -2367,16 +2377,16 @@ fi
 %files libs
 %{_libdir}/libdcerpc-samr.so.*

-%{_libdir}/samba/libLIBWBCLIENT-OLD-samba4.so
-%{_libdir}/samba/libauth-unix-token-samba4.so
-%{_libdir}/samba/libdcerpc-samba4.so
-%{_libdir}/samba/libdnsserver-common-samba4.so
-%{_libdir}/samba/libshares-samba4.so
-%{_libdir}/samba/libsmbpasswdparser-samba4.so
-%{_libdir}/samba/libxattr-tdb-samba4.so
-%{_libdir}/samba/libREG-FULL-samba4.so
-%{_libdir}/samba/libRPC-SERVER-LOOP-samba4.so
-%{_libdir}/samba/libRPC-WORKER-samba4.so
+%{_libdir}/samba/libLIBWBCLIENT-OLD-private-samba.so
+%{_libdir}/samba/libauth-unix-token-private-samba.so
+%{_libdir}/samba/libdcerpc-samba4-private-samba.so
+%{_libdir}/samba/libdnsserver-common-private-samba.so
+%{_libdir}/samba/libshares-private-samba.so
+%{_libdir}/samba/libsmbpasswdparser-private-samba.so
+%{_libdir}/samba/libxattr-tdb-private-samba.so
+%{_libdir}/samba/libREG-FULL-private-samba.so
+%{_libdir}/samba/libRPC-SERVER-LOOP-private-samba.so
+%{_libdir}/samba/libRPC-WORKER-private-samba.so

 ### LIBNETAPI
 %files -n libnetapi
@ -2476,6 +2486,7 @@ fi
 %{python3_sitearch}/samba/__pycache__/drs_utils.*.pyc
 %{python3_sitearch}/samba/__pycache__/functional_level.*.pyc
 %{python3_sitearch}/samba/__pycache__/getopt.*.pyc
+%{python3_sitearch}/samba/__pycache__/gkdi.*.pyc
 %{python3_sitearch}/samba/__pycache__/graph.*.pyc
 %{python3_sitearch}/samba/__pycache__/hostconfig.*.pyc
 %{python3_sitearch}/samba/__pycache__/idmap.*.pyc
@ -2486,6 +2497,7 @@ fi
 %{python3_sitearch}/samba/__pycache__/ms_schema.*.pyc
 %{python3_sitearch}/samba/__pycache__/ndr.*.pyc
 %{python3_sitearch}/samba/__pycache__/ntacls.*.pyc
+%{python3_sitearch}/samba/__pycache__/nt_time.*.pyc
 %{python3_sitearch}/samba/__pycache__/policies.*.pyc
 %{python3_sitearch}/samba/__pycache__/safe_tarfile.*.pyc
 %{python3_sitearch}/samba/__pycache__/sd_utils.*.pyc
@ -2514,6 +2526,7 @@ fi
 %{python3_sitearch}/samba/dcerpc/auth.*.so
 %{python3_sitearch}/samba/dcerpc/base.*.so
 %{python3_sitearch}/samba/dcerpc/claims.*.so
+%{python3_sitearch}/samba/dcerpc/conditional_ace.*.so
 %{python3_sitearch}/samba/dcerpc/dcerpc.*.so
 %{python3_sitearch}/samba/dcerpc/dfs.*.so
 %{python3_sitearch}/samba/dcerpc/dns.*.so
@ -2522,6 +2535,8 @@ fi
 %{python3_sitearch}/samba/dcerpc/drsuapi.*.so
 %{python3_sitearch}/samba/dcerpc/echo.*.so
 %{python3_sitearch}/samba/dcerpc/epmapper.*.so
+%{python3_sitearch}/samba/dcerpc/gkdi.*.so
+%{python3_sitearch}/samba/dcerpc/gmsa.*.so
 %{python3_sitearch}/samba/dcerpc/idmap.*.so
 %{python3_sitearch}/samba/dcerpc/initshutdown.*.so
 %{python3_sitearch}/samba/dcerpc/irpc.*.so
@ -2540,6 +2555,8 @@ fi
 %{python3_sitearch}/samba/dcerpc/security.*.so
 %{python3_sitearch}/samba/dcerpc/server_id.*.so
 %{python3_sitearch}/samba/dcerpc/smb_acl.*.so
+%{python3_sitearch}/samba/dcerpc/smb3posix.*.so
+%{python3_sitearch}/samba/dcerpc/smbXsrv.*.so
 %{python3_sitearch}/samba/dcerpc/spoolss.*.so
 %{python3_sitearch}/samba/dcerpc/srvsvc.*.so
 %{python3_sitearch}/samba/dcerpc/svcctl.*.so
@ -2559,6 +2576,7 @@ fi
 %{python3_sitearch}/samba/functional_level.py
 %{python3_sitearch}/samba/gensec.*.so
 %{python3_sitearch}/samba/getopt.py
+%{python3_sitearch}/samba/gkdi.py
 %{python3_sitearch}/samba/graph.py
 %{python3_sitearch}/samba/hostconfig.py
 %{python3_sitearch}/samba/idmap.py
@ -2585,6 +2603,7 @@ fi
 %{python3_sitearch}/samba/gp/__pycache__/gp_centrify_crontab_ext.*.pyc
 %{python3_sitearch}/samba/gp/__pycache__/gp_centrify_sudoers_ext.*.pyc
 %{python3_sitearch}/samba/gp/__pycache__/gp_cert_auto_enroll_ext.*.pyc
+%{python3_sitearch}/samba/gp/__pycache__/gp_drive_maps_ext.*.pyc
 %{python3_sitearch}/samba/gp/__pycache__/gp_chromium_ext.*.pyc
 %{python3_sitearch}/samba/gp/__pycache__/gp_ext_loader.*.pyc
 %{python3_sitearch}/samba/gp/__pycache__/gp_firefox_ext.*.pyc
@ -2610,6 +2629,7 @@ fi
 %{python3_sitearch}/samba/gp/gp_centrify_crontab_ext.py
 %{python3_sitearch}/samba/gp/gp_centrify_sudoers_ext.py
 %{python3_sitearch}/samba/gp/gp_cert_auto_enroll_ext.py
+%{python3_sitearch}/samba/gp/gp_drive_maps_ext.py
 %{python3_sitearch}/samba/gp/gp_chromium_ext.py
 %{python3_sitearch}/samba/gp/gp_ext_loader.py
 %{python3_sitearch}/samba/gp/gp_firefox_ext.py
@ -2644,6 +2664,7 @@ fi
 %{python3_sitearch}/samba/gp_parse/gp_inf.py
 %{python3_sitearch}/samba/gp_parse/gp_ini.py
 %{python3_sitearch}/samba/gp_parse/gp_pol.py
+%{python3_sitearch}/samba/hresult.*.so
 %{python3_sitearch}/samba/logger.py
 %{python3_sitearch}/samba/mdb_util.py
 %{python3_sitearch}/samba/ms_display_specifiers.py
@ -2675,11 +2696,11 @@ fi
 %{python3_sitearch}/samba/netcmd/__pycache__/processes.*.pyc
 %{python3_sitearch}/samba/netcmd/__pycache__/pso.*.pyc
 %{python3_sitearch}/samba/netcmd/__pycache__/rodc.*.pyc
+%{python3_sitearch}/samba/netcmd/__pycache__/shell.*.pyc
 %{python3_sitearch}/samba/netcmd/__pycache__/schema.*.pyc
 %{python3_sitearch}/samba/netcmd/__pycache__/sites.*.pyc
 %{python3_sitearch}/samba/netcmd/__pycache__/spn.*.pyc
 %{python3_sitearch}/samba/netcmd/__pycache__/testparm.*.pyc
-%{python3_sitearch}/samba/netcmd/__pycache__/user.*.pyc
 %{python3_sitearch}/samba/netcmd/__pycache__/validators.*.pyc
 %{python3_sitearch}/samba/netcmd/__pycache__/visualize.*.pyc
 %{python3_sitearch}/samba/netcmd/common.py
@ -2746,7 +2767,9 @@ fi
 %{python3_sitearch}/samba/netcmd/domain/models/__pycache__/claim_type.*.pyc
 %{python3_sitearch}/samba/netcmd/domain/models/__pycache__/exceptions.*.pyc
 %{python3_sitearch}/samba/netcmd/domain/models/__pycache__/fields.*.pyc
+%{python3_sitearch}/samba/netcmd/domain/models/__pycache__/group.*.pyc
 %{python3_sitearch}/samba/netcmd/domain/models/__pycache__/model.*.pyc
+%{python3_sitearch}/samba/netcmd/domain/models/__pycache__/query.*.pyc
 %{python3_sitearch}/samba/netcmd/domain/models/__pycache__/schema.*.pyc
 %{python3_sitearch}/samba/netcmd/domain/models/__pycache__/site.*.pyc
 %{python3_sitearch}/samba/netcmd/domain/models/__pycache__/subnet.*.pyc
@ -2757,7 +2780,9 @@ fi
 %{python3_sitearch}/samba/netcmd/domain/models/claim_type.py
 %{python3_sitearch}/samba/netcmd/domain/models/exceptions.py
 %{python3_sitearch}/samba/netcmd/domain/models/fields.py
+%{python3_sitearch}/samba/netcmd/domain/models/group.py
 %{python3_sitearch}/samba/netcmd/domain/models/model.py
+%{python3_sitearch}/samba/netcmd/domain/models/query.py
 %{python3_sitearch}/samba/netcmd/domain/models/schema.py
 %{python3_sitearch}/samba/netcmd/domain/models/site.py
 %{python3_sitearch}/samba/netcmd/domain/models/subnet.py
@ -2787,13 +2812,72 @@ fi
 %{python3_sitearch}/samba/netcmd/pso.py
 %{python3_sitearch}/samba/netcmd/rodc.py
 %{python3_sitearch}/samba/netcmd/schema.py
+%{python3_sitearch}/samba/netcmd/shell.py
 %{python3_sitearch}/samba/netcmd/sites.py
 %{python3_sitearch}/samba/netcmd/spn.py
 %{python3_sitearch}/samba/netcmd/testparm.py
-%{python3_sitearch}/samba/netcmd/user.py
+%dir %{python3_sitearch}/samba/netcmd/user
+%{python3_sitearch}/samba/netcmd/user/__init__.py
+%{python3_sitearch}/samba/netcmd/user/add.py
+%{python3_sitearch}/samba/netcmd/user/add_unix_attrs.py
+%dir %{python3_sitearch}/samba/netcmd/user/auth
+%{python3_sitearch}/samba/netcmd/user/auth/__init__.py
+%{python3_sitearch}/samba/netcmd/user/auth/policy.py
+%dir %{python3_sitearch}/samba/netcmd/user/auth/__pycache__
+%{python3_sitearch}/samba/netcmd/user/auth/__pycache__/__init__.*.pyc
+%{python3_sitearch}/samba/netcmd/user/auth/__pycache__/policy.*.pyc
+%{python3_sitearch}/samba/netcmd/user/auth/__pycache__/silo.*.pyc
+%{python3_sitearch}/samba/netcmd/user/auth/silo.py
+%{python3_sitearch}/samba/netcmd/user/delete.py
+%{python3_sitearch}/samba/netcmd/user/disable.py
+%{python3_sitearch}/samba/netcmd/user/edit.py
+%{python3_sitearch}/samba/netcmd/user/enable.py
+%{python3_sitearch}/samba/netcmd/user/getgroups.py
+%{python3_sitearch}/samba/netcmd/user/list.py
+%{python3_sitearch}/samba/netcmd/user/move.py
+%{python3_sitearch}/samba/netcmd/user/password.py
+%dir %{python3_sitearch}/samba/netcmd/user/__pycache__
+%{python3_sitearch}/samba/netcmd/user/__pycache__/__init__.*.pyc
+%{python3_sitearch}/samba/netcmd/user/__pycache__/add.*.pyc
+%{python3_sitearch}/samba/netcmd/user/__pycache__/add_unix_attrs.*.pyc
+%{python3_sitearch}/samba/netcmd/user/__pycache__/delete.*.pyc
+%{python3_sitearch}/samba/netcmd/user/__pycache__/disable.*.pyc
+%{python3_sitearch}/samba/netcmd/user/__pycache__/edit.*.pyc
+%{python3_sitearch}/samba/netcmd/user/__pycache__/enable.*.pyc
+%{python3_sitearch}/samba/netcmd/user/__pycache__/getgroups.*.pyc
+%{python3_sitearch}/samba/netcmd/user/__pycache__/list.*.pyc
+%{python3_sitearch}/samba/netcmd/user/__pycache__/move.*.pyc
+%{python3_sitearch}/samba/netcmd/user/__pycache__/password.*.pyc
+%{python3_sitearch}/samba/netcmd/user/__pycache__/rename.*.pyc
+%{python3_sitearch}/samba/netcmd/user/__pycache__/sensitive.*.pyc
+%{python3_sitearch}/samba/netcmd/user/__pycache__/setexpiry.*.pyc
+%{python3_sitearch}/samba/netcmd/user/__pycache__/setpassword.*.pyc
+%{python3_sitearch}/samba/netcmd/user/__pycache__/setprimarygroup.*.pyc
+%{python3_sitearch}/samba/netcmd/user/__pycache__/unlock.*.pyc
+%dir %{python3_sitearch}/samba/netcmd/user/readpasswords
+%{python3_sitearch}/samba/netcmd/user/readpasswords/common.py
+%{python3_sitearch}/samba/netcmd/user/readpasswords/get_kerberos_ticket.py
+%{python3_sitearch}/samba/netcmd/user/readpasswords/getpassword.py
+%{python3_sitearch}/samba/netcmd/user/readpasswords/__init__.py
+%dir %{python3_sitearch}/samba/netcmd/user/readpasswords/__pycache__
+%{python3_sitearch}/samba/netcmd/user/readpasswords/__pycache__/__init__.*.pyc
+%{python3_sitearch}/samba/netcmd/user/readpasswords/__pycache__/common.*.pyc
+%{python3_sitearch}/samba/netcmd/user/readpasswords/__pycache__/get_kerberos_ticket.*.pyc
+%{python3_sitearch}/samba/netcmd/user/readpasswords/__pycache__/getpassword.*.pyc
+%{python3_sitearch}/samba/netcmd/user/readpasswords/__pycache__/show.*.pyc
+%{python3_sitearch}/samba/netcmd/user/readpasswords/__pycache__/syncpasswords.*.pyc
+%{python3_sitearch}/samba/netcmd/user/readpasswords/show.py
+%{python3_sitearch}/samba/netcmd/user/readpasswords/syncpasswords.py
+%{python3_sitearch}/samba/netcmd/user/rename.py
+%{python3_sitearch}/samba/netcmd/user/sensitive.py
+%{python3_sitearch}/samba/netcmd/user/setexpiry.py
+%{python3_sitearch}/samba/netcmd/user/setpassword.py
+%{python3_sitearch}/samba/netcmd/user/setprimarygroup.py
+%{python3_sitearch}/samba/netcmd/user/unlock.py
 %{python3_sitearch}/samba/netcmd/validators.py
 %{python3_sitearch}/samba/netcmd/visualize.py
 %{python3_sitearch}/samba/ntacls.py
+%{python3_sitearch}/samba/nt_time.py
 %{python3_sitearch}/samba/param.*.so
 %{python3_sitearch}/samba/policies.py
 %{python3_sitearch}/samba/policy.*.so
@ -2935,6 +3019,9 @@ fi
 %{python3_sitearch}/samba/tests/__pycache__/common.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/complex_expressions.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/compression.*.pyc
+%{python3_sitearch}/samba/tests/__pycache__/conditional_ace_assembler.*.pyc
+%{python3_sitearch}/samba/tests/__pycache__/conditional_ace_bytes.*.pyc
+%{python3_sitearch}/samba/tests/__pycache__/conditional_ace_claims.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/core.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/credentials.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/cred_opt.*.pyc
@ -2959,6 +3046,7 @@ fi
 %{python3_sitearch}/samba/tests/__pycache__/gensec.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/get_opt.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/getdcname.*.pyc
+%{python3_sitearch}/samba/tests/__pycache__/gkdi.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/glue.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/gpo.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/gpo_member.*.pyc
@ -2979,7 +3067,6 @@ fi
 %{python3_sitearch}/samba/tests/__pycache__/libsmb-basic.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/lsa_string.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/messaging.*.pyc
-%{python3_sitearch}/samba/tests/__pycache__/ndr.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/netbios.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/netcmd.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/net_join_no_spnego.*.pyc
@ -3025,7 +3112,9 @@ fi
 %{python3_sitearch}/samba/tests/__pycache__/samdb.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/samdb_api.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/sddl.*.pyc
+%{python3_sitearch}/samba/tests/__pycache__/sddl_conditional_ace.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/security.*.pyc
+%{python3_sitearch}/samba/tests/__pycache__/security_descriptors.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/segfault.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/sid_strings.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/smb.*.pyc
@ -3041,6 +3130,7 @@ fi
 %{python3_sitearch}/samba/tests/__pycache__/strings.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/subunitrun.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/tdb_util.*.pyc
+%{python3_sitearch}/samba/tests/__pycache__/token_factory.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/upgrade.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/upgradeprovision.*.pyc
 %{python3_sitearch}/samba/tests/__pycache__/upgradeprovisionneeddc.*.pyc
@ -3064,16 +3154,22 @@ fi
 %{python3_sitearch}/samba/tests/blackbox/__pycache__/__init__.*.pyc
 %{python3_sitearch}/samba/tests/blackbox/__pycache__/bug13653.*.pyc
 %{python3_sitearch}/samba/tests/blackbox/__pycache__/check_output.*.pyc
+%{python3_sitearch}/samba/tests/blackbox/__pycache__/claims.*.pyc
 %{python3_sitearch}/samba/tests/blackbox/__pycache__/downgradedatabase.*.pyc
+%{python3_sitearch}/samba/tests/blackbox/__pycache__/http_chunk.*.pyc
+%{python3_sitearch}/samba/tests/blackbox/__pycache__/http_content.*.pyc
 %{python3_sitearch}/samba/tests/blackbox/__pycache__/mdsearch.*.pyc
+%{python3_sitearch}/samba/tests/blackbox/__pycache__/misc_dfs_widelink.*.pyc
 %{python3_sitearch}/samba/tests/blackbox/__pycache__/ndrdump.*.pyc
 %{python3_sitearch}/samba/tests/blackbox/__pycache__/netads_dns.*.pyc
 %{python3_sitearch}/samba/tests/blackbox/__pycache__/netads_json.*.pyc
+%{python3_sitearch}/samba/tests/blackbox/__pycache__/rpcd_witness_samba_only.*.pyc
 %{python3_sitearch}/samba/tests/blackbox/__pycache__/samba_dnsupdate.*.pyc
 %{python3_sitearch}/samba/tests/blackbox/__pycache__/smbcacls.*.pyc
 %{python3_sitearch}/samba/tests/blackbox/__pycache__/smbcacls_basic.*.pyc
 %{python3_sitearch}/samba/tests/blackbox/__pycache__/smbcacls_dfs_propagate_inherit.*.pyc
 %{python3_sitearch}/samba/tests/blackbox/__pycache__/smbcacls_propagate_inhertance.*.pyc
+%{python3_sitearch}/samba/tests/blackbox/__pycache__/smbcacls_save_restore.*.pyc
 %{python3_sitearch}/samba/tests/blackbox/__pycache__/smbcontrol.*.pyc
 %{python3_sitearch}/samba/tests/blackbox/__pycache__/smbcontrol_process.*.pyc
 %{python3_sitearch}/samba/tests/blackbox/__pycache__/traffic_learner.*.pyc
@ -3081,16 +3177,22 @@ fi
 %{python3_sitearch}/samba/tests/blackbox/__pycache__/traffic_summary.*.pyc
 %{python3_sitearch}/samba/tests/blackbox/bug13653.py
 %{python3_sitearch}/samba/tests/blackbox/check_output.py
+%{python3_sitearch}/samba/tests/blackbox/claims.py
 %{python3_sitearch}/samba/tests/blackbox/downgradedatabase.py
+%{python3_sitearch}/samba/tests/blackbox/http_chunk.py
+%{python3_sitearch}/samba/tests/blackbox/http_content.py
 %{python3_sitearch}/samba/tests/blackbox/mdsearch.py
+%{python3_sitearch}/samba/tests/blackbox/misc_dfs_widelink.py
 %{python3_sitearch}/samba/tests/blackbox/ndrdump.py
 %{python3_sitearch}/samba/tests/blackbox/netads_dns.py
 %{python3_sitearch}/samba/tests/blackbox/netads_json.py
+%{python3_sitearch}/samba/tests/blackbox/rpcd_witness_samba_only.py
 %{python3_sitearch}/samba/tests/blackbox/samba_dnsupdate.py
 %{python3_sitearch}/samba/tests/blackbox/smbcacls.py
 %{python3_sitearch}/samba/tests/blackbox/smbcacls_basic.py
 %{python3_sitearch}/samba/tests/blackbox/smbcacls_dfs_propagate_inherit.py
 %{python3_sitearch}/samba/tests/blackbox/smbcacls_propagate_inhertance.py
+%{python3_sitearch}/samba/tests/blackbox/smbcacls_save_restore.py
 %{python3_sitearch}/samba/tests/blackbox/smbcontrol.py
 %{python3_sitearch}/samba/tests/blackbox/smbcontrol_process.py
 %{python3_sitearch}/samba/tests/blackbox/traffic_learner.py
@ -3099,6 +3201,9 @@ fi
 %{python3_sitearch}/samba/tests/common.py
 %{python3_sitearch}/samba/tests/compression.py
 %{python3_sitearch}/samba/tests/complex_expressions.py
+%{python3_sitearch}/samba/tests/conditional_ace_assembler.py
+%{python3_sitearch}/samba/tests/conditional_ace_bytes.py
+%{python3_sitearch}/samba/tests/conditional_ace_claims.py
 %{python3_sitearch}/samba/tests/core.py
 %{python3_sitearch}/samba/tests/credentials.py
 %{python3_sitearch}/samba/tests/cred_opt.py
@ -3178,6 +3283,7 @@ fi
 %{python3_sitearch}/samba/tests/gensec.py
 %{python3_sitearch}/samba/tests/getdcname.py
 %{python3_sitearch}/samba/tests/get_opt.py
+%{python3_sitearch}/samba/tests/gkdi.py
 %{python3_sitearch}/samba/tests/glue.py
 %{python3_sitearch}/samba/tests/gpo.py
 %{python3_sitearch}/samba/tests/gpo_member.py
@ -3207,14 +3313,17 @@ fi
 %{python3_sitearch}/samba/tests/krb5/__pycache__/claims_in_pac.*.pyc
 %{python3_sitearch}/samba/tests/krb5/__pycache__/claims_tests.*.pyc
 %{python3_sitearch}/samba/tests/krb5/__pycache__/compatability_tests.*.pyc
+%{python3_sitearch}/samba/tests/krb5/__pycache__/conditional_ace_tests.*.pyc
 %{python3_sitearch}/samba/tests/krb5/__pycache__/device_tests.*.pyc
 %{python3_sitearch}/samba/tests/krb5/__pycache__/etype_tests.*.pyc
 %{python3_sitearch}/samba/tests/krb5/__pycache__/fast_tests.*.pyc
+%{python3_sitearch}/samba/tests/krb5/__pycache__/gkdi_tests.*.pyc
 %{python3_sitearch}/samba/tests/krb5/__pycache__/group_tests.*.pyc
 %{python3_sitearch}/samba/tests/krb5/__pycache__/kcrypto.*.pyc
 %{python3_sitearch}/samba/tests/krb5/__pycache__/kdc_base_test.*.pyc
 %{python3_sitearch}/samba/tests/krb5/__pycache__/kdc_tests.*.pyc
 %{python3_sitearch}/samba/tests/krb5/__pycache__/kdc_tgs_tests.*.pyc
+%{python3_sitearch}/samba/tests/krb5/__pycache__/kdc_tgt_tests.*.pyc
 %{python3_sitearch}/samba/tests/krb5/__pycache__/kpasswd_tests.*.pyc
 %{python3_sitearch}/samba/tests/krb5/__pycache__/lockout_tests.*.pyc
 %{python3_sitearch}/samba/tests/krb5/__pycache__/ms_kile_client_principal_lookup_tests.*.pyc
@ -3225,6 +3334,7 @@ fi
 %{python3_sitearch}/samba/tests/krb5/__pycache__/raw_testcase.*.pyc
 %{python3_sitearch}/samba/tests/krb5/__pycache__/rfc4120_constants.*.pyc
 %{python3_sitearch}/samba/tests/krb5/__pycache__/rfc4120_pyasn1.*.pyc
+%{python3_sitearch}/samba/tests/krb5/__pycache__/rfc4120_pyasn1_generated.*.pyc
 %{python3_sitearch}/samba/tests/krb5/__pycache__/rodc_tests.*.pyc
 %{python3_sitearch}/samba/tests/krb5/__pycache__/simple_tests.*.pyc
 %{python3_sitearch}/samba/tests/krb5/__pycache__/s4u_tests.*.pyc
@ -3244,14 +3354,17 @@ fi
 %{python3_sitearch}/samba/tests/krb5/claims_in_pac.py
 %{python3_sitearch}/samba/tests/krb5/claims_tests.py
 %{python3_sitearch}/samba/tests/krb5/compatability_tests.py
+%{python3_sitearch}/samba/tests/krb5/conditional_ace_tests.py
 %{python3_sitearch}/samba/tests/krb5/device_tests.py
 %{python3_sitearch}/samba/tests/krb5/etype_tests.py
 %{python3_sitearch}/samba/tests/krb5/fast_tests.py
+%{python3_sitearch}/samba/tests/krb5/gkdi_tests.py
 %{python3_sitearch}/samba/tests/krb5/group_tests.py
 %{python3_sitearch}/samba/tests/krb5/kcrypto.py
 %{python3_sitearch}/samba/tests/krb5/kdc_base_test.py
 %{python3_sitearch}/samba/tests/krb5/kdc_tests.py
 %{python3_sitearch}/samba/tests/krb5/kdc_tgs_tests.py
+%{python3_sitearch}/samba/tests/krb5/kdc_tgt_tests.py
 %{python3_sitearch}/samba/tests/krb5/kpasswd_tests.py
 %{python3_sitearch}/samba/tests/krb5/lockout_tests.py
 %{python3_sitearch}/samba/tests/krb5/ms_kile_client_principal_lookup_tests.py
@ -3262,6 +3375,7 @@ fi
 %{python3_sitearch}/samba/tests/krb5/raw_testcase.py
 %{python3_sitearch}/samba/tests/krb5/rfc4120_constants.py
 %{python3_sitearch}/samba/tests/krb5/rfc4120_pyasn1.py
+%{python3_sitearch}/samba/tests/krb5/rfc4120_pyasn1_generated.py
 %{python3_sitearch}/samba/tests/krb5/rodc_tests.py
 %{python3_sitearch}/samba/tests/krb5/simple_tests.py
 %{python3_sitearch}/samba/tests/krb5/test_idmap_nss.py
@ -3286,7 +3400,14 @@ fi
 %{python3_sitearch}/samba/tests/logfiles.py
 %{python3_sitearch}/samba/tests/lsa_string.py
 %{python3_sitearch}/samba/tests/messaging.py
-%{python3_sitearch}/samba/tests/ndr.py
+%dir %{python3_sitearch}/samba/tests/ndr
+%{python3_sitearch}/samba/tests/ndr/gkdi.py
+%{python3_sitearch}/samba/tests/ndr/gmsa.py
+%dir %{python3_sitearch}/samba/tests/ndr/__pycache__
+%{python3_sitearch}/samba/tests/ndr/__pycache__/gkdi.*.pyc
+%{python3_sitearch}/samba/tests/ndr/__pycache__/gmsa.*.pyc
+%{python3_sitearch}/samba/tests/ndr/__pycache__/wbint.*.pyc
+%{python3_sitearch}/samba/tests/ndr/wbint.py
 %{python3_sitearch}/samba/tests/netbios.py
 %{python3_sitearch}/samba/tests/netcmd.py
 %{python3_sitearch}/samba/tests/net_join_no_spnego.py
@ -3338,7 +3459,6 @@ fi
 %{python3_sitearch}/samba/tests/samba_tool/__pycache__/contact.*.pyc
 %{python3_sitearch}/samba/tests/samba_tool/__pycache__/demote.*.pyc
 %{python3_sitearch}/samba/tests/samba_tool/__pycache__/dnscmd.*.pyc
-%{python3_sitearch}/samba/tests/samba_tool/__pycache__/domain_auth_base.*.pyc
 %{python3_sitearch}/samba/tests/samba_tool/__pycache__/domain_auth_policy.*.pyc
 %{python3_sitearch}/samba/tests/samba_tool/__pycache__/domain_auth_silo.*.pyc
 %{python3_sitearch}/samba/tests/samba_tool/__pycache__/domain_claim.*.pyc
@ -3364,10 +3484,15 @@ fi
 %{python3_sitearch}/samba/tests/samba_tool/__pycache__/provision_userPassword_crypt.*.pyc
 %{python3_sitearch}/samba/tests/samba_tool/__pycache__/rodc.*.pyc
 %{python3_sitearch}/samba/tests/samba_tool/__pycache__/schema.*.pyc
+%{python3_sitearch}/samba/tests/samba_tool/__pycache__/silo_base.*.pyc
 %{python3_sitearch}/samba/tests/samba_tool/__pycache__/sites.*.pyc
 %{python3_sitearch}/samba/tests/samba_tool/__pycache__/timecmd.*.pyc
 %{python3_sitearch}/samba/tests/samba_tool/__pycache__/user.*.pyc
+%{python3_sitearch}/samba/tests/samba_tool/__pycache__/user_auth_policy.*.pyc
+%{python3_sitearch}/samba/tests/samba_tool/__pycache__/user_auth_silo.*.pyc
 %{python3_sitearch}/samba/tests/samba_tool/__pycache__/user_check_password_script.*.pyc
+%{python3_sitearch}/samba/tests/samba_tool/__pycache__/user_get_kerberos_ticket.*.pyc
+%{python3_sitearch}/samba/tests/samba_tool/__pycache__/user_getpassword_gmsa.*.pyc
 %{python3_sitearch}/samba/tests/samba_tool/__pycache__/user_virtualCryptSHA.*.pyc
 %{python3_sitearch}/samba/tests/samba_tool/__pycache__/user_virtualCryptSHA_base.*.pyc
 %{python3_sitearch}/samba/tests/samba_tool/__pycache__/user_virtualCryptSHA_gpg.*.pyc
@ -3380,7 +3505,6 @@ fi
 %{python3_sitearch}/samba/tests/samba_tool/contact.py
 %{python3_sitearch}/samba/tests/samba_tool/demote.py
 %{python3_sitearch}/samba/tests/samba_tool/dnscmd.py
-%{python3_sitearch}/samba/tests/samba_tool/domain_auth_base.py
 %{python3_sitearch}/samba/tests/samba_tool/domain_auth_policy.py
 %{python3_sitearch}/samba/tests/samba_tool/domain_auth_silo.py
 %{python3_sitearch}/samba/tests/samba_tool/domain_claim.py
@ -3406,10 +3530,15 @@ fi
 %{python3_sitearch}/samba/tests/samba_tool/provision_userPassword_crypt.py
 %{python3_sitearch}/samba/tests/samba_tool/rodc.py
 %{python3_sitearch}/samba/tests/samba_tool/schema.py
+%{python3_sitearch}/samba/tests/samba_tool/silo_base.py
 %{python3_sitearch}/samba/tests/samba_tool/sites.py
 %{python3_sitearch}/samba/tests/samba_tool/timecmd.py
 %{python3_sitearch}/samba/tests/samba_tool/user.py
+%{python3_sitearch}/samba/tests/samba_tool/user_auth_policy.py
+%{python3_sitearch}/samba/tests/samba_tool/user_auth_silo.py
 %{python3_sitearch}/samba/tests/samba_tool/user_check_password_script.py
+%{python3_sitearch}/samba/tests/samba_tool/user_get_kerberos_ticket.py
+%{python3_sitearch}/samba/tests/samba_tool/user_getpassword_gmsa.py
 %{python3_sitearch}/samba/tests/samba_tool/user_virtualCryptSHA.py
 %{python3_sitearch}/samba/tests/samba_tool/user_virtualCryptSHA_base.py
 %{python3_sitearch}/samba/tests/samba_tool/user_virtualCryptSHA_gpg.py
@ -3420,7 +3549,9 @@ fi
 %{python3_sitearch}/samba/tests/samdb.py
 %{python3_sitearch}/samba/tests/samdb_api.py
 %{python3_sitearch}/samba/tests/sddl.py
+%{python3_sitearch}/samba/tests/sddl_conditional_ace.py
 %{python3_sitearch}/samba/tests/security.py
+%{python3_sitearch}/samba/tests/security_descriptors.py
 %{python3_sitearch}/samba/tests/segfault.py
 %{python3_sitearch}/samba/tests/sid_strings.py
 %{python3_sitearch}/samba/tests/smb.py
@ -3436,6 +3567,7 @@ fi
 %{python3_sitearch}/samba/tests/strings.py
 %{python3_sitearch}/samba/tests/subunitrun.py
 %{python3_sitearch}/samba/tests/tdb_util.py
+%{python3_sitearch}/samba/tests/token_factory.py
 %{python3_sitearch}/samba/tests/upgrade.py
 %{python3_sitearch}/samba/tests/upgradeprovision.py
 %{python3_sitearch}/samba/tests/upgradeprovisionneeddc.py
@ -3466,9 +3598,9 @@ fi
 ### TEST-LIBS
 %files test-libs
 %if %{with dc} || %{with testsuite}
-%{_libdir}/samba/libdlz-bind9-for-torture-samba4.so
+%{_libdir}/samba/libdlz-bind9-for-torture-private-samba.so
 %else
-%{_libdir}/samba/libdsdb-module-samba4.so
+%{_libdir}/samba/libdsdb-module-private-samba.so
 %endif

 ### USERSHARES
@ -3481,8 +3613,8 @@ fi
 %files winbind
 %{_libdir}/samba/idmap
 %{_libdir}/samba/nss_info
-%{_libdir}/samba/libnss-info-samba4.so
-%{_libdir}/samba/libidmap-samba4.so
+%{_libdir}/samba/libnss-info-private-samba.so
+%{_libdir}/samba/libidmap-private-samba.so
 %{_sbindir}/winbindd
 %{_sysusersdir}/samba-winbind.conf
 %attr(750,root,wbpriv) %dir /var/lib/samba/winbindd_privileged
@ -3614,6 +3746,7 @@ fi
 %{_datadir}/ctdb/events/legacy/31.clamd.script
 %{_datadir}/ctdb/events/legacy/40.vsftpd.script
 %{_datadir}/ctdb/events/legacy/41.httpd.script
+%{_datadir}/ctdb/events/legacy/47.samba-dcerpcd.script
 %{_datadir}/ctdb/events/legacy/48.netbios.script
 %{_datadir}/ctdb/events/legacy/49.winbind.script
 %{_datadir}/ctdb/events/legacy/50.samba.script
@ -4473,8 +4606,31 @@ fi
 %endif

 %changelog
-* Wed Apr 24 2024 Pavel Filipenský <pfilipen@redhat.com> - 4.19.4-105
- resolves: RHEL-33783 - Add option to request only POSIX groups from AD in idmap_ad
+* Thu Aug 01 2024 Pavel Filipenský <pfilipen@redhat.com> - 4.20.2-2
+- resolves: RHEL-47757 - Allow to run samba-bgqd as a standalone systemd service
+
+* Tue Jul 02 2024 Pavel Filipenský <pfilipen@redhat.com> - 4.20.2-1
+- related: RHEL-33645 - Update to version 4.20.2
+- resolves: RHEL-45841 - Fix KDC IP address lookup in case of trusted domain
+- resolves: RHEL-23814 - Fix smbclient to enumerate the printers
+
+* Wed May 29 2024 Pavel Filipenský <pfilipen@redhat.com> - 4.20.1-1
+- related: RHEL-33645 - Remove autorelease - rpmautospec is not available for rhel-9 yet
+
+* Tue May 28 2024 Pavel Filipenský <pfilipen@redhat.com> - 4.20.1-1
+- related: RHEL-33645 - Update to version 4.20.1
+- resolves: RHEL-26337 - Fix site lookup for samba-gpupdate
+- resolves: RHEL-5846 - Fix warning messages while upgrading libwbclient
+
+* Mon Apr 29 2024 Pavel Filipenský <pfilipen@redhat.com> - 4.20.0-103
+- resolves: RHEL-20473 - Improve performance of winbind idmap_ad backend
+
+* Mon Apr 29 2024 Pavel Filipenský <pfilipen@redhat.com> - 4.20.0-102
+- resolves: RHEL-2109  - Support Certificate Auto Enrollment in Samba
+- resolves: RHEL-22157 - Fix root cert import for samba-gpupdate
+
+* Fri Apr 26 2024 Pavel Filipenský <pfilipen@redhat.com> - 4.20.0-101
+- resolves: RHEL-33645 - Update to version 4.20.0

 * Mon Feb 19 2024 Andreas Schneider <asn@redhat.com> - 4.19.4-104
 - related: RHEL-2109 - Disable support for certificate auto enrollment
@ -7248,3 +7404,4 @@ fi
 - Added a number of options to smb.conf file
 - Added smbadduser command (missed from all previous RPMs) - Doooh!
 - Added smbuser file and smb.conf file updates for username map
+