.gitignore

@@ -1,2 +1,2 @@
-SOURCES/samba-4.20.2.tar.xz
+SOURCES/samba-4.19.4.tar.xz
 SOURCES/samba-pubkey_AA99442FB680B620.gpg

.samba.metadata

@@ -1,2 +1,2 @@
-607bea15c2306b165610ebe3f617f1b29ef7f133 SOURCES/samba-4.20.2.tar.xz
+6a164128df94dd89e785ca9f42d7be5714f16bed SOURCES/samba-4.19.4.tar.xz
 971f563c447eda8d144d6c9e743cd0f0488c0d9e SOURCES/samba-pubkey_AA99442FB680B620.gpg

SOURCES/redhat-4.20.2.patch

@@ -1,618 +0,0 @@
-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/3] .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.46.1
-
-
-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/3] 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.46.1
-
-
-From 2e7ffc196aa9f241622a32ea002d96ad00799e4d Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@samba.org>
-Date: Mon, 22 Jul 2024 12:26:55 +0200
-Subject: [PATCH 3/3] s3:notifyd: Use a watcher per db record
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-This fixes a O(n²) performance regression in notifyd. The problem was
-that we had a watcher per notify instance. This changes the code to have
-a watcher per notify db entry.
-
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=14430
-
-Signed-off-by: Andreas Schneider <asn@samba.org>
-Reviewed-by: Stefan Metzmacher <metze@samba.org>
-
-Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
-Autobuild-Date(master): Tue Oct  1 14:22:43 UTC 2024 on atb-devel-224
----
- source3/smbd/notifyd/notifyd.c         | 214 ++++++++++++++++++-------
- source3/smbd/notifyd/notifyd_db.c      |   5 +-
- source3/smbd/notifyd/notifyd_entry.c   |  51 ++++--
- source3/smbd/notifyd/notifyd_private.h |  46 ++++--
- 4 files changed, 228 insertions(+), 88 deletions(-)
-
-diff --git a/source3/smbd/notifyd/notifyd.c b/source3/smbd/notifyd/notifyd.c
-index ca303bd4d51..b368b8390fa 100644
---- a/source3/smbd/notifyd/notifyd.c
-+++ b/source3/smbd/notifyd/notifyd.c
-@@ -337,6 +337,7 @@ static bool notifyd_apply_rec_change(
- 	struct messaging_context *msg_ctx)
- {
- 	struct db_record *rec = NULL;
-+	struct notifyd_watcher watcher = {};
- 	struct notifyd_instance *instances = NULL;
- 	size_t num_instances;
- 	size_t i;
-@@ -344,6 +345,7 @@ static bool notifyd_apply_rec_change(
- 	TDB_DATA value;
- 	NTSTATUS status;
- 	bool ok = false;
-+	bool new_watcher = false;
- 
- 	if (pathlen == 0) {
- 		DBG_WARNING("pathlen==0\n");
-@@ -374,8 +376,12 @@ static bool notifyd_apply_rec_change(
- 	value = dbwrap_record_get_value(rec);
- 
- 	if (value.dsize != 0) {
--		if (!notifyd_parse_entry(value.dptr, value.dsize, NULL,
--					 &num_instances)) {
-+		ok = notifyd_parse_entry(value.dptr,
-+					 value.dsize,
-+					 &watcher,
-+					 NULL,
-+					 &num_instances);
-+		if (!ok) {
- 			goto fail;
- 		}
- 	}
-@@ -390,8 +396,22 @@ static bool notifyd_apply_rec_change(
- 		goto fail;
- 	}
- 
--	if (value.dsize != 0) {
--		memcpy(instances, value.dptr, value.dsize);
-+	if (num_instances > 0) {
-+		struct notifyd_instance *tmp = NULL;
-+		size_t num_tmp = 0;
-+
-+		ok = notifyd_parse_entry(value.dptr,
-+					 value.dsize,
-+					 NULL,
-+					 &tmp,
-+					 &num_tmp);
-+		if (!ok) {
-+			goto fail;
-+		}
-+
-+		memcpy(instances,
-+		       tmp,
-+		       sizeof(struct notifyd_instance) * num_tmp);
- 	}
- 
- 	for (i=0; i<num_instances; i++) {
-@@ -414,41 +434,106 @@ static bool notifyd_apply_rec_change(
- 		*instance = (struct notifyd_instance) {
- 			.client = *client,
- 			.instance = *chg,
--			.internal_filter = chg->filter,
--			.internal_subdir_filter = chg->subdir_filter
- 		};
- 
- 		num_instances += 1;
- 	}
- 
--	if ((instance->instance.filter != 0) ||
--	    (instance->instance.subdir_filter != 0)) {
--		int ret;
-+	/*
-+	 * Calculate an intersection of the instances filters for the watcher.
-+	 */
-+	if (instance->instance.filter > 0) {
-+		uint32_t filter = instance->instance.filter;
-+
-+		if ((watcher.filter & filter) != filter) {
-+			watcher.filter |= filter;
-+
-+			new_watcher = true;
-+		}
-+	}
-+
-+	/*
-+	 * Calculate an intersection of the instances subdir_filters for the
-+	 * watcher.
-+	 */
-+	if (instance->instance.subdir_filter > 0) {
-+		uint32_t subdir_filter = instance->instance.subdir_filter;
- 
--		TALLOC_FREE(instance->sys_watch);
-+		if ((watcher.subdir_filter & subdir_filter) != subdir_filter) {
-+			watcher.subdir_filter |= subdir_filter;
- 
--		ret = sys_notify_watch(entries, sys_notify_ctx, path,
--				       &instance->internal_filter,
--				       &instance->internal_subdir_filter,
--				       notifyd_sys_callback, msg_ctx,
--				       &instance->sys_watch);
--		if (ret != 0) {
--			DBG_WARNING("sys_notify_watch for [%s] returned %s\n",
--				    path, strerror(errno));
-+			new_watcher = true;
- 		}
- 	}
- 
- 	if ((instance->instance.filter == 0) &&
- 	    (instance->instance.subdir_filter == 0)) {
-+		uint32_t tmp_filter = 0;
-+		uint32_t tmp_subdir_filter = 0;
-+
- 		/* This is a delete request */
--		TALLOC_FREE(instance->sys_watch);
- 		*instance = instances[num_instances-1];
- 		num_instances -= 1;
-+
-+		for (i = 0; i < num_instances; i++) {
-+			struct notifyd_instance *tmp = &instances[i];
-+
-+			tmp_filter |= tmp->instance.filter;
-+			tmp_subdir_filter |= tmp->instance.subdir_filter;
-+		}
-+
-+		/*
-+		 * If the filter has changed, register a new watcher with the
-+		 * changed filter.
-+		 */
-+		if (watcher.filter != tmp_filter ||
-+		    watcher.subdir_filter != tmp_subdir_filter)
-+		{
-+			watcher.filter = tmp_filter;
-+			watcher.subdir_filter = tmp_subdir_filter;
-+
-+			new_watcher = true;
-+		}
-+	}
-+
-+	if (new_watcher) {
-+		/*
-+		 * In case we removed all notify instances, we want to remove
-+		 * the watcher. We won't register a new one, if no filters are
-+		 * set anymore.
-+		 */
-+
-+		TALLOC_FREE(watcher.sys_watch);
-+
-+		watcher.sys_filter = watcher.filter;
-+		watcher.sys_subdir_filter = watcher.subdir_filter;
-+
-+		/*
-+		 * Only register a watcher if we have filter.
-+		 */
-+		if (watcher.filter != 0 || watcher.subdir_filter != 0) {
-+			int ret = sys_notify_watch(entries,
-+						   sys_notify_ctx,
-+						   path,
-+						   &watcher.sys_filter,
-+						   &watcher.sys_subdir_filter,
-+						   notifyd_sys_callback,
-+						   msg_ctx,
-+						   &watcher.sys_watch);
-+			if (ret != 0) {
-+				DBG_WARNING("sys_notify_watch for [%s] "
-+					    "returned %s\n",
-+					    path,
-+					    strerror(errno));
-+			}
-+		}
- 	}
- 
- 	DBG_DEBUG("%s has %zu instances\n", path, num_instances);
- 
- 	if (num_instances == 0) {
-+		TALLOC_FREE(watcher.sys_watch);
-+
- 		status = dbwrap_record_delete(rec);
- 		if (!NT_STATUS_IS_OK(status)) {
- 			DBG_WARNING("dbwrap_record_delete returned %s\n",
-@@ -456,13 +541,21 @@ static bool notifyd_apply_rec_change(
- 			goto fail;
- 		}
- 	} else {
--		value = make_tdb_data(
--			(uint8_t *)instances,
--			sizeof(struct notifyd_instance) * num_instances);
-+		struct TDB_DATA iov[2] = {
-+			{
-+				.dptr = (uint8_t *)&watcher,
-+				.dsize = sizeof(struct notifyd_watcher),
-+			},
-+			{
-+				.dptr = (uint8_t *)instances,
-+				.dsize = sizeof(struct notifyd_instance) *
-+					 num_instances,
-+			},
-+		};
- 
--		status = dbwrap_record_store(rec, value, 0);
-+		status = dbwrap_record_storev(rec, iov, ARRAY_SIZE(iov), 0);
- 		if (!NT_STATUS_IS_OK(status)) {
--			DBG_WARNING("dbwrap_record_store returned %s\n",
-+			DBG_WARNING("dbwrap_record_storev returned %s\n",
- 				    nt_errstr(status));
- 			goto fail;
- 		}
-@@ -706,12 +799,18 @@ static void notifyd_trigger_parser(TDB_DATA key, TDB_DATA data,
- 					.when = tstate->msg->when };
- 	struct iovec iov[2];
- 	size_t path_len = key.dsize;
-+	struct notifyd_watcher watcher = {};
- 	struct notifyd_instance *instances = NULL;
- 	size_t num_instances = 0;
- 	size_t i;
-+	bool ok;
- 
--	if (!notifyd_parse_entry(data.dptr, data.dsize, &instances,
--				 &num_instances)) {
-+	ok = notifyd_parse_entry(data.dptr,
-+				 data.dsize,
-+				 &watcher,
-+				 &instances,
-+				 &num_instances);
-+	if (!ok) {
- 		DBG_DEBUG("Could not parse notifyd_entry\n");
- 		return;
- 	}
-@@ -734,9 +833,11 @@ static void notifyd_trigger_parser(TDB_DATA key, TDB_DATA data,
- 
- 		if (tstate->covered_by_sys_notify) {
- 			if (tstate->recursive) {
--				i_filter = instance->internal_subdir_filter;
-+				i_filter = watcher.sys_subdir_filter &
-+					   instance->instance.subdir_filter;
- 			} else {
--				i_filter = instance->internal_filter;
-+				i_filter = watcher.sys_filter &
-+					   instance->instance.filter;
- 			}
- 		} else {
- 			if (tstate->recursive) {
-@@ -1142,46 +1243,39 @@ static int notifyd_add_proxy_syswatches(struct db_record *rec,
- 	struct db_context *db = dbwrap_record_get_db(rec);
- 	TDB_DATA key = dbwrap_record_get_key(rec);
- 	TDB_DATA value = dbwrap_record_get_value(rec);
--	struct notifyd_instance *instances = NULL;
--	size_t num_instances = 0;
--	size_t i;
-+	struct notifyd_watcher watcher = {};
- 	char path[key.dsize+1];
- 	bool ok;
-+	int ret;
- 
- 	memcpy(path, key.dptr, key.dsize);
- 	path[key.dsize] = '\0';
- 
--	ok = notifyd_parse_entry(value.dptr, value.dsize, &instances,
--				 &num_instances);
-+	/* This is a remote database, we just need the watcher. */
-+	ok = notifyd_parse_entry(value.dptr, value.dsize, &watcher, NULL, NULL);
- 	if (!ok) {
- 		DBG_WARNING("Could not parse notifyd entry for %s\n", path);
- 		return 0;
- 	}
- 
--	for (i=0; i<num_instances; i++) {
--		struct notifyd_instance *instance = &instances[i];
--		uint32_t filter = instance->instance.filter;
--		uint32_t subdir_filter = instance->instance.subdir_filter;
--		int ret;
-+	watcher.sys_watch = NULL;
-+	watcher.sys_filter = watcher.filter;
-+	watcher.sys_subdir_filter = watcher.subdir_filter;
- 
--		/*
--		 * This is a remote database. Pointers that we were
--		 * given don't make sense locally. Initialize to NULL
--		 * in case sys_notify_watch fails.
--		 */
--		instances[i].sys_watch = NULL;
--
--		ret = state->sys_notify_watch(
--			db, state->sys_notify_ctx, path,
--			&filter, &subdir_filter,
--			notifyd_sys_callback, state->msg_ctx,
--			&instance->sys_watch);
--		if (ret != 0) {
--			DBG_WARNING("inotify_watch returned %s\n",
--				    strerror(errno));
--		}
-+	ret = state->sys_notify_watch(db,
-+				      state->sys_notify_ctx,
-+				      path,
-+				      &watcher.filter,
-+				      &watcher.subdir_filter,
-+				      notifyd_sys_callback,
-+				      state->msg_ctx,
-+				      &watcher.sys_watch);
-+	if (ret != 0) {
-+		DBG_WARNING("inotify_watch returned %s\n", strerror(errno));
- 	}
- 
-+	memcpy(value.dptr, &watcher, sizeof(struct notifyd_watcher));
-+
- 	return 0;
- }
- 
-@@ -1189,21 +1283,17 @@ static int notifyd_db_del_syswatches(struct db_record *rec, void *private_data)
- {
- 	TDB_DATA key = dbwrap_record_get_key(rec);
- 	TDB_DATA value = dbwrap_record_get_value(rec);
--	struct notifyd_instance *instances = NULL;
--	size_t num_instances = 0;
--	size_t i;
-+	struct notifyd_watcher watcher = {};
- 	bool ok;
- 
--	ok = notifyd_parse_entry(value.dptr, value.dsize, &instances,
--				 &num_instances);
-+	ok = notifyd_parse_entry(value.dptr, value.dsize, &watcher, NULL, NULL);
- 	if (!ok) {
- 		DBG_WARNING("Could not parse notifyd entry for %.*s\n",
- 			    (int)key.dsize, (char *)key.dptr);
- 		return 0;
- 	}
--	for (i=0; i<num_instances; i++) {
--		TALLOC_FREE(instances[i].sys_watch);
--	}
-+	TALLOC_FREE(watcher.sys_watch);
-+
- 	return 0;
- }
- 
-diff --git a/source3/smbd/notifyd/notifyd_db.c b/source3/smbd/notifyd/notifyd_db.c
-index 18228619e9a..7dc3cd58081 100644
---- a/source3/smbd/notifyd/notifyd_db.c
-+++ b/source3/smbd/notifyd/notifyd_db.c
-@@ -40,7 +40,10 @@ static bool notifyd_parse_db_parser(TDB_DATA key, TDB_DATA value,
- 	memcpy(path, key.dptr, key.dsize);
- 	path[key.dsize] = 0;
- 
--	ok = notifyd_parse_entry(value.dptr, value.dsize, &instances,
-+	ok = notifyd_parse_entry(value.dptr,
-+				 value.dsize,
-+				 NULL,
-+				 &instances,
- 				 &num_instances);
- 	if (!ok) {
- 		DBG_DEBUG("Could not parse entry for path %s\n", path);
-diff --git a/source3/smbd/notifyd/notifyd_entry.c b/source3/smbd/notifyd/notifyd_entry.c
-index 539010de03a..f3b0e908136 100644
---- a/source3/smbd/notifyd/notifyd_entry.c
-+++ b/source3/smbd/notifyd/notifyd_entry.c
-@@ -21,22 +21,51 @@
-  * Parse an entry in the notifyd_context->entries database
-  */
- 
--bool notifyd_parse_entry(
--	uint8_t *buf,
--	size_t buflen,
--	struct notifyd_instance **instances,
--	size_t *num_instances)
-+/**
-+ * @brief Parse a notifyd database entry.
-+ *
-+ * The memory we pass down needs to be aligned. If it isn't aligned we can run
-+ * into obscure errors as we just point into the data buffer.
-+ *
-+ * @param data The data to parse
-+ * @param data_len The length of the data to parse
-+ * @param watcher A pointer to store the watcher data or NULL.
-+ * @param instances A pointer to store the array of notify instances or NULL.
-+ * @param pnum_instances The number of elements in the array. If you just want
-+ * the number of elements pass NULL for the watcher and instances pointers.
-+ *
-+ * @return true on success, false if an error occurred.
-+ */
-+bool notifyd_parse_entry(uint8_t *data,
-+			 size_t data_len,
-+			 struct notifyd_watcher *watcher,
-+			 struct notifyd_instance **instances,
-+			 size_t *pnum_instances)
- {
--	if ((buflen % sizeof(struct notifyd_instance)) != 0) {
--		DBG_WARNING("invalid buffer size: %zu\n", buflen);
-+	size_t ilen;
-+
-+	if (data_len < sizeof(struct notifyd_watcher)) {
- 		return false;
- 	}
- 
--	if (instances != NULL) {
--		*instances = (struct notifyd_instance *)buf;
-+	if (watcher != NULL) {
-+		*watcher = *((struct notifyd_watcher *)(uintptr_t)data);
- 	}
--	if (num_instances != NULL) {
--		*num_instances = buflen / sizeof(struct notifyd_instance);
-+
-+	ilen = data_len - sizeof(struct notifyd_watcher);
-+	if ((ilen % sizeof(struct notifyd_instance)) != 0) {
-+		return false;
-+	}
-+
-+	if (pnum_instances != NULL) {
-+		*pnum_instances = ilen / sizeof(struct notifyd_instance);
- 	}
-+	if (instances != NULL) {
-+		/* The (uintptr_t) cast removes a warning from -Wcast-align. */
-+		*instances =
-+			(struct notifyd_instance *)(uintptr_t)
-+				(data + sizeof(struct notifyd_watcher));
-+	}
-+
- 	return true;
- }
-diff --git a/source3/smbd/notifyd/notifyd_private.h b/source3/smbd/notifyd/notifyd_private.h
-index 36c08f47c54..db8e6e1c005 100644
---- a/source3/smbd/notifyd/notifyd_private.h
-+++ b/source3/smbd/notifyd/notifyd_private.h
-@@ -20,30 +20,48 @@
- #include "lib/util/server_id.h"
- #include "notifyd.h"
- 
-+
- /*
-- * notifyd's representation of a notify instance
-+ * Representation of a watcher for a path
-+ *
-+ * This will be stored in the db.
-  */
--struct notifyd_instance {
--	struct server_id client;
--	struct notify_instance instance;
--
--	void *sys_watch; /* inotify/fam/etc handle */
-+struct notifyd_watcher {
-+	/*
-+	 * This is an intersections of the filter the watcher is listening for.
-+	 */
-+	uint32_t filter;
-+	uint32_t subdir_filter;
- 
- 	/*
--	 * Filters after sys_watch took responsibility of some bits
-+	 * Those are inout variables passed to the sys_watcher. The sys_watcher
-+	 * will remove the bits it can't handle.
- 	 */
--	uint32_t internal_filter;
--	uint32_t internal_subdir_filter;
-+	uint32_t sys_filter;
-+	uint32_t sys_subdir_filter;
-+
-+	/* The handle for inotify/fam etc. */
-+	void *sys_watch;
-+};
-+
-+/*
-+ * Representation of a notifyd instance
-+ *
-+ * This will be stored in the db.
-+ */
-+struct notifyd_instance {
-+	struct server_id client;
-+	struct notify_instance instance;
- };
- 
- /*
-  * Parse an entry in the notifyd_context->entries database
-  */
- 
--bool notifyd_parse_entry(
--	uint8_t *buf,
--	size_t buflen,
--	struct notifyd_instance **instances,
--	size_t *num_instances);
-+bool notifyd_parse_entry(uint8_t *data,
-+			 size_t data_len,
-+			 struct notifyd_watcher *watcher,
-+			 struct notifyd_instance **instances,
-+			 size_t *num_instances);
- 
- #endif
--- 
-2.46.1
-

SOURCES/samba-4.19.4.tar.asc

@@ -0,0 +1,16 @@
+-----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-----

SOURCES/samba-4.20.2.tar.asc

@@ -1,16 +0,0 @@
------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-----

SPECS/samba.spec

@@ -26,7 +26,7 @@
 %{!?_make_verbose:%define _make_verbose V=1 VERBOSE=1}
 
 # Build with Active Directory Domain Controller support by default on Fedora
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?msvsphere}
 %bcond_without dc
 %else
 %bcond_with dc
@@ -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 riscv64
+%ifarch aarch64 s390x x86_64
 %bcond_without vfs_cephfs
 %bcond_without ceph_mutex
 %else
@@ -80,7 +80,7 @@
 
 %if 0%{?fedora}
 
-%ifarch aarch64 ppc64le s390x x86_64 riscv64
+%ifarch aarch64 ppc64le s390x x86_64
 %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 riscv64
+%ifarch aarch64 ppc64le s390x x86_64
 %bcond_without vfs_io_uring
 %else
 %bcond_with vfs_io_uring
@@ -139,15 +139,15 @@
 %endif
 
 %if 0%{?fedora} || 0%{?rhel} >= 9
-%bcond_without gpupdate
+%bcond_with 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.20.2
-%global baserelease 2
+%global samba_version 4.19.4
+%global baserelease 105
 # 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 4
+%global libndr_so_version 3
 %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.2
-%global tdb_version 1.4.10
-%global tevent_version 0.16.1
-%global ldb_version 2.9.1
+%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 required_mit_krb5 1.20.1
 
@@ -205,7 +205,7 @@
 
 Name:           samba
 Version:        %{samba_version}
-Release:        %{samba_release}%{?dist}
+Release:        %{samba_release}%{?dist}.inferit
 
 %if 0%{?fedora}
 Epoch:          2
@@ -238,15 +238,11 @@ Source18:       samba-winbind-systemd-sysusers.conf
 Source201:      README.downgrade
 Source202:      samba.abignore
 
-# Patch0 is created using:
+# 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.
 #
-# 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
+# Generate the patchset using: git format-patch -l1 --stdout -N > samba-4.19-redhat.patch
+Patch0:        samba-4.19-redhat.patch
 
 Requires(pre): %{name}-common = %{samba_depver}
 Requires: %{name}-common = %{samba_depver}
@@ -342,7 +338,7 @@ BuildRequires: zlib-devel >= 1.2.3
 
 BuildRequires: pkgconfig(libsystemd)
 
-%ifnarch i686 riscv64
+%ifnarch i686
 %if 0%{?fedora} >= 37
 BuildRequires: mold
 %endif
@@ -372,7 +368,7 @@ BuildRequires: python3-etcd
 %endif
 
 %if %{with gpupdate}
-BuildRequires: cepces-certmonger >= 0.3.8
+BuildRequires: cepces-certmonger
 %endif
 
 # pidl requirements
@@ -1231,8 +1227,10 @@ xzcat %{SOURCE0} | gpgv2 --quiet --keyring %{SOURCE2} %{SOURCE1} -
 %endif
 %autosetup -n samba-%{version}%{pre_release} -p1
 
-# Make sure we do not build with heimdal code
-rm -rfv third_party/heimdal
+# 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
 
 %build
 %if %{with includelibs}
@@ -1282,7 +1280,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 riscv64
+%ifnarch i686
 %if 0%{?fedora} >= 37
 export LDFLAGS="%{__global_ldflags} -fuse-ld=mold"
 export python_LDFLAGS="$(echo ${LDFLAGS} | sed -e 's/-Wl,-z,defs//g')"
@@ -1371,11 +1369,9 @@ popd
 install -d -m 0755 %{buildroot}/usr/{sbin,bin}
 install -d -m 0755 %{buildroot}%{_libdir}/security
 install -d -m 0755 %{buildroot}/var/lib/samba
-install -d -m 0755 %{buildroot}/var/lib/samba/certs
 install -d -m 0755 %{buildroot}/var/lib/samba/drivers
 install -d -m 0755 %{buildroot}/var/lib/samba/lock
 install -d -m 0755 %{buildroot}/var/lib/samba/private
-install -d -m 0755 %{buildroot}/var/lib/samba/private/certs
 install -d -m 0755 %{buildroot}/var/lib/samba/scripts
 install -d -m 0755 %{buildroot}/var/lib/samba/sysvol
 install -d -m 0755 %{buildroot}/var/lib/samba/usershares
@@ -1524,17 +1520,14 @@ 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
 
@@ -1599,9 +1592,9 @@ fi
 %if %{with libwbclient}
 %pre -n libwbclient
 if [ $1 -gt 1 ] ; then
-    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
+    rm -rf %{_libdir}/samba/wbclient/
+    rm -f /etc/alternatives/libwbclient.so*
+    rm -f /var/lib/alternatives/libwbclient.so*
 fi
 %{?ldconfig}
 #endif {with libwbclient}
@@ -1659,6 +1652,8 @@ 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
@@ -1668,7 +1663,7 @@ fi
 %{_sbindir}/smbd
 %if %{with dc} || %{with testsuite}
 # This is only used by vfs_dfs_samba4
-%{_libdir}/samba/libdfs-server-ad-private-samba.so
+%{_libdir}/samba/libdfs-server-ad-samba4.so
 %endif
 %dir %{_libdir}/samba/auth
 %{_libdir}/samba/auth/unix.so
@@ -1730,7 +1725,6 @@ 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
@@ -1807,7 +1801,6 @@ fi
 %{_bindir}/smbspool
 %{_bindir}/smbtar
 %{_bindir}/smbtree
-%{_bindir}/wspsearch
 %dir %{_libexecdir}/samba
 %ghost %{_libexecdir}/samba/cups_backend_smb
 %{_mandir}/man1/dbwrap_tool.1*
@@ -1828,7 +1821,6 @@ 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.*
@@ -1880,86 +1872,86 @@ fi
 %{_libdir}/libtevent-util.so.%{libtevent_util_so_version}*
 
 %dir %{_libdir}/samba
-%{_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
+%{_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
 
 %if %{without libwbclient}
 %{_libdir}/samba/libwbclient.so.*
@@ -1974,9 +1966,9 @@ fi
 
 %if %{with includelibs}
 %{_libdir}/samba/libldb-*.so
-%{_libdir}/samba/libtalloc-private-samba.so
-%{_libdir}/samba/libtdb-private-samba.so
-%{_libdir}/samba/libtevent-private-samba.so
+%{_libdir}/samba/libtalloc-samba4.so
+%{_libdir}/samba/libtdb-samba4.so
+%{_libdir}/samba/libtevent-samba4.so
 
 %{_libdir}/samba/ldb/asq.so
 %{_libdir}/samba/ldb/ldb.so
@@ -1995,8 +1987,6 @@ fi
 
 ### COMMON
 %files common
-%doc README.md WHATSNEW.txt
-%license COPYING
 %{_tmpfilesdir}/samba.conf
 %{_sysusersdir}/samba.conf
 %dir %{_sysconfdir}/logrotate.d/
@@ -2006,9 +1996,7 @@ fi
 %ghost %dir /run/samba
 %ghost %dir /run/winbindd
 %dir /var/lib/samba
-%dir /var/lib/samba/certs
 %attr(700,root,root) %dir /var/lib/samba/private
-%attr(700,root,root) %dir /var/lib/samba/private/certs
 %dir /var/lib/samba/lock
 %attr(755,root,root) %dir %{_sysconfdir}/samba
 %config(noreplace) %{_sysconfdir}/samba/smb.conf
@@ -2023,7 +2011,7 @@ fi
 ### COMMON-LIBS
 %files common-libs
 # common libraries
-%{_libdir}/samba/libcmdline-private-samba.so
+%{_libdir}/samba/libcmdline-samba4.so
 
 %dir %{_libdir}/samba/ldb
 
@@ -2068,7 +2056,6 @@ fi
 %endif
 %{_libexecdir}/samba/rpcd_spoolss
 %{_libexecdir}/samba/rpcd_winreg
-%{_libexecdir}/samba/rpcd_witness
 %{_mandir}/man8/samba-dcerpcd.8*
 
 ### DC
@@ -2154,16 +2141,16 @@ fi
 %endif
 ### DC-LIBS
 %files dc-libs
-%{_libdir}/samba/libauth4-private-samba.so
+%{_libdir}/samba/libauth4-samba4.so
 
 %if %{with dc} || %{with testsuite}
-%{_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
+%{_libdir}/samba/libdb-glue-samba4.so
+%{_libdir}/samba/libpac-samba4.so
+%{_libdir}/samba/libprocess-model-samba4.so
+%{_libdir}/samba/libservice-samba4.so
 
 %if %{with testsuite}
-%{_libdir}/samba/libntvfs-private-samba.so
+%{_libdir}/samba/libntvfs-samba4.so
 %endif
 
 %dir %{_libdir}/samba/process_model
@@ -2189,11 +2176,11 @@ fi
 %endif
 
 %{_libdir}/libdcerpc-server.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
+%{_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
 
 ### DC-BIND
 %files dc-bind-dlz
@@ -2267,7 +2254,6 @@ 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
@@ -2381,16 +2367,16 @@ fi
 %files libs
 %{_libdir}/libdcerpc-samr.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
+%{_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
 
 ### LIBNETAPI
 %files -n libnetapi
@@ -2490,7 +2476,6 @@ 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
@@ -2501,7 +2486,6 @@ 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
@@ -2530,7 +2514,6 @@ 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
@@ -2539,8 +2522,6 @@ 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
@@ -2559,8 +2540,6 @@ 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
@@ -2580,7 +2559,6 @@ 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
@@ -2607,7 +2585,6 @@ 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
@@ -2633,7 +2610,6 @@ 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
@@ -2668,7 +2644,6 @@ 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
@@ -2700,11 +2675,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
@@ -2771,9 +2746,7 @@ 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
@@ -2784,9 +2757,7 @@ 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
@@ -2816,72 +2787,13 @@ 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
-%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/user.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
@@ -3023,9 +2935,6 @@ 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
@@ -3050,7 +2959,6 @@ 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
@@ -3071,6 +2979,7 @@ 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
@@ -3116,9 +3025,7 @@ 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
@@ -3134,7 +3041,6 @@ 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
@@ -3158,22 +3064,16 @@ 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
@@ -3181,22 +3081,16 @@ 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
@@ -3205,9 +3099,6 @@ 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
@@ -3287,7 +3178,6 @@ 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
@@ -3317,17 +3207,14 @@ 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
@@ -3338,7 +3225,6 @@ 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
@@ -3358,17 +3244,14 @@ 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
@@ -3379,7 +3262,6 @@ 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
@@ -3404,14 +3286,7 @@ fi
 %{python3_sitearch}/samba/tests/logfiles.py
 %{python3_sitearch}/samba/tests/lsa_string.py
 %{python3_sitearch}/samba/tests/messaging.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/ndr.py
 %{python3_sitearch}/samba/tests/netbios.py
 %{python3_sitearch}/samba/tests/netcmd.py
 %{python3_sitearch}/samba/tests/net_join_no_spnego.py
@@ -3463,6 +3338,7 @@ 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
@@ -3488,15 +3364,10 @@ 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
@@ -3509,6 +3380,7 @@ 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
@@ -3534,15 +3406,10 @@ 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
@@ -3553,9 +3420,7 @@ 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
@@ -3571,7 +3436,6 @@ 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
@@ -3602,9 +3466,9 @@ fi
 ### TEST-LIBS
 %files test-libs
 %if %{with dc} || %{with testsuite}
-%{_libdir}/samba/libdlz-bind9-for-torture-private-samba.so
+%{_libdir}/samba/libdlz-bind9-for-torture-samba4.so
 %else
-%{_libdir}/samba/libdsdb-module-private-samba.so
+%{_libdir}/samba/libdsdb-module-samba4.so
 %endif
 
 ### USERSHARES
@@ -3617,8 +3481,8 @@ fi
 %files winbind
 %{_libdir}/samba/idmap
 %{_libdir}/samba/nss_info
-%{_libdir}/samba/libnss-info-private-samba.so
-%{_libdir}/samba/libidmap-private-samba.so
+%{_libdir}/samba/libnss-info-samba4.so
+%{_libdir}/samba/libidmap-samba4.so
 %{_sbindir}/winbindd
 %{_sysusersdir}/samba-winbind.conf
 %attr(750,root,wbpriv) %dir /var/lib/samba/winbindd_privileged
@@ -3750,7 +3614,6 @@ 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
@@ -4610,31 +4473,11 @@ fi
 %endif
 
 %changelog
-* 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 Oct 28 2024 Arkady L. Shane <tigro@msvsphere-os.ru> - 2:4.19.4-105.inferit
+- INF-1541: Rebuilt with enabled AD DC
 
-* 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
+* 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
 
 * Mon Feb 19 2024 Andreas Schneider <asn@redhat.com> - 4.19.4-104
 - related: RHEL-2109 - Disable support for certificate auto enrollment
@@ -4691,6 +4534,9 @@ fi
 * Thu Apr 27 2023 Andreas Schneider <asn@redhat.com> - 4.17.5-104
 - related: rhbz#2182163 - Rebuild for liburing rebase to version 2.3
 
+* Wed Mar 15 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 4.17.5-102
+- Rebuilt for MSVSphere 9.1.
+
 * Wed Feb 15 2023 Pavel Filipenský <pfilipen@redhat.com> - 4.17.5-102
 - resolves: rhbz#2169980 - Fix winbind memory leak
 - resolves: rhbz#2156056 - Fix Samba shares not accessible issue