Update to 4.18.11

Guenther

.gitignore

@@ -321,3 +321,31 @@ samba-3.6.0pre1.tar.gz
 /samba-4.18.0rc1.tar.asc
 /samba-4.18.0rc2.tar.xz
 /samba-4.18.0rc2.tar.asc
+/samba-4.18.0rc3.tar.xz
+/samba-4.18.0rc3.tar.asc
+/samba-4.18.0rc4.tar.xz
+/samba-4.18.0rc4.tar.asc
+/samba-4.18.0.tar.xz
+/samba-4.18.0.tar.asc
+/samba-4.18.1.tar.xz
+/samba-4.18.1.tar.asc
+/samba-4.18.2.tar.xz
+/samba-4.18.2.tar.asc
+/samba-4.18.3.tar.xz
+/samba-4.18.3.tar.asc
+/samba-4.18.4.tar.xz
+/samba-4.18.4.tar.asc
+/samba-4.18.5.tar.xz
+/samba-4.18.5.tar.asc
+/samba-4.18.6.tar.xz
+/samba-4.18.6.tar.asc
+/samba-4.18.7.tar.xz
+/samba-4.18.7.tar.asc
+/samba-4.18.8.tar.xz
+/samba-4.18.8.tar.asc
+/samba-4.18.9.tar.xz
+/samba-4.18.9.tar.asc
+/samba-4.18.10.tar.xz
+/samba-4.18.10.tar.asc
+/samba-4.18.11.tar.xz
+/samba-4.18.11.tar.asc

samba-4.17-fix-changeuserpassword4.patch

@@ -1,540 +0,0 @@
-From a3e3d05f35d6082ea48450060b39084e3d0e4056 Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@samba.org>
-Date: Mon, 10 Oct 2022 15:15:20 +0200
-Subject: [PATCH 1/5] s3:librpc: Improve GSE error message
-
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=15206
-
-Signed-off-by: Andreas Schneider <asn@samba.org>
-Reviewed-by: Noel Power <noel.power@suse.com>
----
- source3/librpc/crypto/gse.c | 21 +++++++++++++++++++--
- 1 file changed, 19 insertions(+), 2 deletions(-)
-
-diff --git a/source3/librpc/crypto/gse.c b/source3/librpc/crypto/gse.c
-index c50a8a036df..c2cac7abf82 100644
---- a/source3/librpc/crypto/gse.c
-+++ b/source3/librpc/crypto/gse.c
-@@ -546,11 +546,28 @@ init_sec_context_done:
- 		goto done;
- 	case GSS_S_FAILURE:
- 		switch (gss_min) {
--		case (OM_uint32)KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN:
--			DBG_NOTICE("Server principal not found\n");
-+		case (OM_uint32)KRB5KDC_ERR_S_PRINCIPAL_UNKNOWN: {
-+			gss_buffer_desc name_token = {
-+				.length = 0,
-+			};
-+
-+			gss_maj = gss_display_name(&gss_min,
-+						   gse_ctx->server_name,
-+						   &name_token,
-+						   NULL);
-+			if (gss_maj == GSS_S_COMPLETE) {
-+				DBG_NOTICE("Server principal %.*s not found\n",
-+					   (int)name_token.length,
-+					   (char *)name_token.value);
-+				gss_release_buffer(&gss_maj, &name_token);
-+			} else {
-+				DBG_NOTICE("Server principal not found\n");
-+			}
-+
- 			/* Make SPNEGO ignore us, we can't go any further here */
- 			status = NT_STATUS_INVALID_PARAMETER;
- 			goto done;
-+		}
- 		case (OM_uint32)KRB5KRB_AP_ERR_TKT_EXPIRED:
- 			DBG_NOTICE("Ticket expired\n");
- 			/* Make SPNEGO ignore us, we can't go any further here */
--- 
-2.37.3
-
-
-From d2e2e9acd717e45806f1b19378e09f39c8fe3da8 Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@samba.org>
-Date: Fri, 7 Oct 2022 14:35:15 +0200
-Subject: [PATCH 2/5] s3:rpcclient: Pass salt down to
- init_samr_CryptPasswordAES()
-
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=15206
-
-Signed-off-by: Andreas Schneider <asn@samba.org>
-Reviewed-by: Noel Power <noel.power@suse.com>
----
- source3/rpc_client/init_samr.c | 15 ++++-----------
- source3/rpc_client/init_samr.h |  1 +
- source3/rpcclient/cmd_samr.c   |  8 ++++++++
- source4/libnet/libnet_passwd.c | 13 +++++++------
- source4/torture/rpc/samr.c     | 27 +++++++++++++++++++++++++++
- 5 files changed, 47 insertions(+), 17 deletions(-)
-
-diff --git a/source3/rpc_client/init_samr.c b/source3/rpc_client/init_samr.c
-index 68f42b602b3..52fa2f90d6e 100644
---- a/source3/rpc_client/init_samr.c
-+++ b/source3/rpc_client/init_samr.c
-@@ -79,6 +79,7 @@ NTSTATUS init_samr_CryptPassword(const char *pwd,
- 
- NTSTATUS init_samr_CryptPasswordAES(TALLOC_CTX *mem_ctx,
- 				    const char *password,
-+				    DATA_BLOB *salt,
- 				    DATA_BLOB *session_key,
- 				    struct samr_EncryptedPasswordAES *ppwd_buf)
- {
-@@ -87,12 +88,6 @@ NTSTATUS init_samr_CryptPasswordAES(TALLOC_CTX *mem_ctx,
- 		.data = pw_data,
- 		.length = sizeof(pw_data),
- 	};
--	size_t iv_size = gnutls_cipher_get_iv_size(GNUTLS_CIPHER_AES_256_CBC);
--	uint8_t iv_data[iv_size];
--	DATA_BLOB iv = {
--		.data = iv_data,
--		.length = iv_size,
--	};
- 	DATA_BLOB ciphertext = data_blob_null;
- 	NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
- 	bool ok;
-@@ -101,8 +96,6 @@ NTSTATUS init_samr_CryptPasswordAES(TALLOC_CTX *mem_ctx,
- 		return NT_STATUS_INVALID_PARAMETER;
- 	}
- 
--	generate_nonce_buffer(iv.data, iv.length);
--
- 	ok = encode_pwd_buffer514_from_str(pw_data, password, STR_UNICODE);
- 	if (!ok) {
- 		return NT_STATUS_INTERNAL_ERROR;
-@@ -114,7 +107,7 @@ NTSTATUS init_samr_CryptPasswordAES(TALLOC_CTX *mem_ctx,
- 			session_key,
- 			&samr_aes256_enc_key_salt,
- 			&samr_aes256_mac_key_salt,
--			&iv,
-+			salt,
- 			&ciphertext,
- 			ppwd_buf->auth_data);
- 	BURN_DATA(pw_data);
-@@ -126,8 +119,8 @@ NTSTATUS init_samr_CryptPasswordAES(TALLOC_CTX *mem_ctx,
- 	ppwd_buf->cipher = ciphertext.data;
- 	ppwd_buf->PBKDF2Iterations = 0;
- 
--	SMB_ASSERT(iv.length == sizeof(ppwd_buf->salt));
--	memcpy(ppwd_buf->salt, iv.data, iv.length);
-+	SMB_ASSERT(salt->length == sizeof(ppwd_buf->salt));
-+	memcpy(ppwd_buf->salt, salt->data, salt->length);
- 
- 	return NT_STATUS_OK;
- }
-diff --git a/source3/rpc_client/init_samr.h b/source3/rpc_client/init_samr.h
-index 940534e7168..71b4c0e573d 100644
---- a/source3/rpc_client/init_samr.h
-+++ b/source3/rpc_client/init_samr.h
-@@ -47,6 +47,7 @@ NTSTATUS init_samr_CryptPassword(const char *pwd,
-  */
- NTSTATUS init_samr_CryptPasswordAES(TALLOC_CTX *mem_ctx,
- 				    const char *password,
-+				    DATA_BLOB *salt,
- 				    DATA_BLOB *session_key,
- 				    struct samr_EncryptedPasswordAES *ppwd_buf);
- 
-diff --git a/source3/rpcclient/cmd_samr.c b/source3/rpcclient/cmd_samr.c
-index 9ccd2f78a8d..8106ca90cf2 100644
---- a/source3/rpcclient/cmd_samr.c
-+++ b/source3/rpcclient/cmd_samr.c
-@@ -3172,6 +3172,11 @@ static NTSTATUS cmd_samr_setuserinfo_int(struct rpc_pipe_client *cli,
- 	uint8_t nt_hash[16];
- 	uint8_t lm_hash[16];
- 	DATA_BLOB session_key;
-+	uint8_t salt_data[16];
-+	DATA_BLOB salt = {
-+		.data = salt_data,
-+		.length = sizeof(salt_data),
-+	};
- 	uint8_t password_expired = 0;
- 	struct dcerpc_binding_handle *b = cli->binding_handle;
- 	TALLOC_CTX *frame = NULL;
-@@ -3198,6 +3203,8 @@ static NTSTATUS cmd_samr_setuserinfo_int(struct rpc_pipe_client *cli,
- 		goto done;
- 	}
- 
-+	generate_nonce_buffer(salt.data, salt.length);
-+
- 	switch(level) {
- 	case 18:
- 	case 21:
-@@ -3220,6 +3227,7 @@ static NTSTATUS cmd_samr_setuserinfo_int(struct rpc_pipe_client *cli,
- 	case 31:
- 		status = init_samr_CryptPasswordAES(frame,
- 						    param,
-+						    &salt,
- 						    &session_key,
- 						    &pwd_buf_aes);
- 		if (!NT_STATUS_IS_OK(status)) {
-diff --git a/source4/libnet/libnet_passwd.c b/source4/libnet/libnet_passwd.c
-index 4f662110e55..a1672104824 100644
---- a/source4/libnet/libnet_passwd.c
-+++ b/source4/libnet/libnet_passwd.c
-@@ -57,13 +57,13 @@ static NTSTATUS libnet_ChangePassword_samr_aes(TALLOC_CTX *mem_ctx,
- 	struct samr_EncryptedPasswordAES pwd_buf = {
- 		.cipher_len = 0
- 	};
--	DATA_BLOB iv = {
-+	DATA_BLOB salt = {
- 		.data = pwd_buf.salt,
- 		.length = sizeof(pwd_buf.salt),
- 	};
--	gnutls_datum_t iv_datum = {
--		.data = iv.data,
--		.size = iv.length,
-+	gnutls_datum_t salt_datum = {
-+		.data = pwd_buf.salt,
-+		.size = sizeof(pwd_buf.salt),
- 	};
- 	uint64_t pbkdf2_iterations = generate_random_u64_range(5000, 1000000);
- 	NTSTATUS status;
-@@ -71,11 +71,11 @@ static NTSTATUS libnet_ChangePassword_samr_aes(TALLOC_CTX *mem_ctx,
- 
- 	E_md4hash(old_password, old_nt_key_data);
- 
--	generate_nonce_buffer(iv.data, iv.length);
-+	generate_nonce_buffer(salt.data, salt.length);
- 
- 	rc = gnutls_pbkdf2(GNUTLS_MAC_SHA512,
- 			   &old_nt_key,
--			   &iv_datum,
-+			   &salt_datum,
- 			   pbkdf2_iterations,
- 			   cek.data,
- 			   cek.length);
-@@ -86,6 +86,7 @@ static NTSTATUS libnet_ChangePassword_samr_aes(TALLOC_CTX *mem_ctx,
- 
- 	status = init_samr_CryptPasswordAES(mem_ctx,
- 					    new_password,
-+					    &salt,
- 					    &cek,
- 					    &pwd_buf);
- 	data_blob_clear(&cek);
-diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
-index de354659067..0b1880efa18 100644
---- a/source4/torture/rpc/samr.c
-+++ b/source4/torture/rpc/samr.c
-@@ -783,6 +783,11 @@ static bool test_SetUserPass_32(struct dcerpc_pipe *p, struct torture_context *t
- 	struct samr_SetUserInfo s;
- 	union samr_UserInfo u;
- 	DATA_BLOB session_key;
-+	uint8_t salt_data[16];
-+	DATA_BLOB salt = {
-+		.data = salt_data,
-+		.length = sizeof(salt_data),
-+	};
- 	char *newpass = NULL;
- 	struct dcerpc_binding_handle *b = p->binding_handle;
- 	struct samr_GetUserPwInfo pwp;
-@@ -818,8 +823,11 @@ static bool test_SetUserPass_32(struct dcerpc_pipe *p, struct torture_context *t
- 		return false;
- 	}
- 
-+	generate_nonce_buffer(salt.data, salt.length);
-+
- 	status = init_samr_CryptPasswordAES(tctx,
- 					    newpass,
-+					    &salt,
- 					    &session_key,
- 					    &u.info32.password);
- 	torture_assert_ntstatus_ok(tctx,
-@@ -852,6 +860,7 @@ static bool test_SetUserPass_32(struct dcerpc_pipe *p, struct torture_context *t
- 
- 	status = init_samr_CryptPasswordAES(tctx,
- 					    newpass,
-+					    &salt,
- 					    &session_key,
- 					    &u.info32.password);
- 	torture_assert_ntstatus_ok(tctx,
-@@ -896,6 +905,11 @@ static bool test_SetUserPass_31(struct dcerpc_pipe *p, struct torture_context *t
- 	union samr_UserInfo u;
- 	bool ret = true;
- 	DATA_BLOB session_key;
-+	uint8_t salt_data[16];
-+	DATA_BLOB salt = {
-+		.data = salt_data,
-+		.length = sizeof(salt_data),
-+	};
- 	char *newpass;
- 	struct dcerpc_binding_handle *b = p->binding_handle;
- 	struct samr_GetUserPwInfo pwp;
-@@ -931,8 +945,11 @@ static bool test_SetUserPass_31(struct dcerpc_pipe *p, struct torture_context *t
- 		return false;
- 	}
- 
-+	generate_nonce_buffer(salt.data, salt.length);
-+
- 	status = init_samr_CryptPasswordAES(tctx,
- 					    newpass,
-+					    &salt,
- 					    &session_key,
- 					    &u.info31.password);
- 	torture_assert_ntstatus_ok(tctx,
-@@ -959,6 +976,7 @@ static bool test_SetUserPass_31(struct dcerpc_pipe *p, struct torture_context *t
- 
- 	status = init_samr_CryptPasswordAES(tctx,
- 					    newpass,
-+					    &salt,
- 					    &session_key,
- 					    &u.info31.password);
- 	torture_assert_ntstatus_ok(tctx,
-@@ -1381,6 +1399,11 @@ static bool test_SetUserPass_level_ex(struct dcerpc_pipe *p,
- 	union samr_UserInfo u;
- 	bool ret = true;
- 	DATA_BLOB session_key;
-+	uint8_t salt_data[16];
-+	DATA_BLOB salt = {
-+		.data = salt_data,
-+		.length = sizeof(salt_data),
-+	};
- 	char *newpass;
- 	struct dcerpc_binding_handle *b = p->binding_handle;
- 	struct samr_GetUserPwInfo pwp;
-@@ -1490,6 +1513,8 @@ static bool test_SetUserPass_level_ex(struct dcerpc_pipe *p,
- 		return false;
- 	}
- 
-+	generate_nonce_buffer(salt.data, salt.length);
-+
- 	switch (level) {
- 	case 18:
- 		{
-@@ -1561,6 +1586,7 @@ static bool test_SetUserPass_level_ex(struct dcerpc_pipe *p,
- 	case 31:
- 		status = init_samr_CryptPasswordAES(tctx,
- 						    newpass,
-+						    &salt,
- 						    &session_key,
- 						    &u.info31.password);
- 
-@@ -1568,6 +1594,7 @@ static bool test_SetUserPass_level_ex(struct dcerpc_pipe *p,
- 	case 32:
- 		status = init_samr_CryptPasswordAES(tctx,
- 						    newpass,
-+						    &salt,
- 						    &session_key,
- 						    &u.info32.password);
- 
--- 
-2.37.3
-
-
-From 1d630363c9b2497266e418aad89c55d5b51a63ad Mon Sep 17 00:00:00 2001
-From: Andreas Schneider <asn@samba.org>
-Date: Mon, 17 Oct 2022 09:02:28 +0200
-Subject: [PATCH 3/5] s4:libnet: If we successfully changed the password we are
- done
-
-BUG: https://bugzilla.samba.org/show_bug.cgi?id=15206
-
-Signed-off-by: Andreas Schneider <asn@samba.org>
-Reviewed-by: Noel Power <noel.power@suse.com>
----
- source4/libnet/libnet_passwd.c | 32 ++++++++++++++++++--------------
- 1 file changed, 18 insertions(+), 14 deletions(-)
-
-diff --git a/source4/libnet/libnet_passwd.c b/source4/libnet/libnet_passwd.c
-index a1672104824..b17614bcd97 100644
---- a/source4/libnet/libnet_passwd.c
-+++ b/source4/libnet/libnet_passwd.c
-@@ -101,7 +101,7 @@ static NTSTATUS libnet_ChangePassword_samr_aes(TALLOC_CTX *mem_ctx,
- 	r.in.password = &pwd_buf;
- 
- 	status = dcerpc_samr_ChangePasswordUser4_r(h, mem_ctx, &r);
--	if (NT_STATUS_IS_OK(status)) {
-+	if (!NT_STATUS_IS_OK(status)) {
- 		goto done;
- 	}
- 	if (!NT_STATUS_IS_OK(r.out.result)) {
-@@ -112,6 +112,7 @@ static NTSTATUS libnet_ChangePassword_samr_aes(TALLOC_CTX *mem_ctx,
- 						account->string,
- 						nt_errstr(status));
- 		status = r.out.result;
-+		goto done;
- 	}
- 
- done:
-@@ -424,20 +425,23 @@ static NTSTATUS libnet_ChangePassword_samr(struct libnet_context *ctx, TALLOC_CT
- 		r->samr.in.oldpassword,
- 		r->samr.in.newpassword,
- 		&(r->samr.out.error_string));
--	if (!NT_STATUS_IS_OK(status)) {
--		if (NT_STATUS_EQUAL(status,
--				     NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE) ||
--		    NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED) ||
--		    NT_STATUS_EQUAL(status, NT_STATUS_NOT_IMPLEMENTED)) {
--			/*
--			* Don't fallback to RC4 based SAMR if weak crypto is not
--			* allowed.
--			*/
--			if (lpcfg_weak_crypto(ctx->lp_ctx) ==
--			SAMBA_WEAK_CRYPTO_DISALLOWED) {
--				goto disconnect;
--			}
-+	if (NT_STATUS_IS_OK(status)) {
-+		goto disconnect;
-+	} else if (NT_STATUS_EQUAL(status,
-+				   NT_STATUS_RPC_PROCNUM_OUT_OF_RANGE) ||
-+		   NT_STATUS_EQUAL(status, NT_STATUS_NOT_SUPPORTED) ||
-+		   NT_STATUS_EQUAL(status, NT_STATUS_NOT_IMPLEMENTED)) {
-+		/*
-+		 * Don't fallback to RC4 based SAMR if weak crypto is not
-+		 * allowed.
-+		 */
-+		if (lpcfg_weak_crypto(ctx->lp_ctx) ==
-+		    SAMBA_WEAK_CRYPTO_DISALLOWED) {
-+			goto disconnect;
- 		}
-+	} else {
-+		/* libnet_ChangePassword_samr_aes is implemented and failed */
-+		goto disconnect;
- 	}
- 
- 	status = libnet_ChangePassword_samr_rc4(
--- 
-2.37.3
-
-
-From 9a4a169ab34641afb87e7f81708c9a72b321879e Mon Sep 17 00:00:00 2001
-From: Noel Power <noel.power@suse.com>
-Date: Fri, 21 Oct 2022 17:40:36 +0100
-Subject: [PATCH 4/5] s4/rpc_server/sambr: don't mutate the return of
- samdb_set_password_aes
-
-prior to this commit return of samdb_set_password_aes was set to
-NT_STATUS_WRONG_PASSWORD on failure. Useful status that should be
-returned such as NT_STATUS_PASSWORD_RESTRICTION are swallowed here
-otherwise (and in this case can be partially responsible for failures
-in test samba.tests.auth_log_pass_change (with later gnutls)
-
-Signed-off-by: Noel Power <noel.power@suse.com>
-Reviewed-by: Andreas Schneider <asn@samba.org>
----
- source4/rpc_server/samr/samr_password.c | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/source4/rpc_server/samr/samr_password.c b/source4/rpc_server/samr/samr_password.c
-index 4691f9a47a9..b581be6361c 100644
---- a/source4/rpc_server/samr/samr_password.c
-+++ b/source4/rpc_server/samr/samr_password.c
-@@ -250,7 +250,6 @@ NTSTATUS dcesrv_samr_ChangePasswordUser4(struct dcesrv_call_state *dce_call,
- 
- 	if (!NT_STATUS_IS_OK(status)) {
- 		ldb_transaction_cancel(sam_ctx);
--		status = NT_STATUS_WRONG_PASSWORD;
- 		goto done;
- 	}
- 
--- 
-2.37.3
-
-
-From b8b36ecba0f22dbc203c12627ebd629c2437c635 Mon Sep 17 00:00:00 2001
-From: Noel Power <noel.power@suse.com>
-Date: Fri, 21 Oct 2022 17:14:44 +0100
-Subject: [PATCH 5/5] python/samba/tests: fix samba.tests.auth_log_pass_change
- for later gnutls
-
-later gnutls that support GNUTLS_PBKDF2 currently fail,
-we need to conditionally switch test data to reflect use of
-'samr_ChangePasswordUser3' or 'samr_ChangePasswordUser4'
-depending on whether GNUTLS_PBKDF2 is supported or not
-
-Signed-off-by: Noel Power <noel.power@suse.com>
-Reviewed-by: Andreas Schneider <asn@samba.org>
----
- python/samba/tests/auth_log_pass_change.py | 20 ++++++++++++++++----
- source4/selftest/tests.py                  |  9 ++++++---
- 2 files changed, 22 insertions(+), 7 deletions(-)
-
-diff --git a/python/samba/tests/auth_log_pass_change.py b/python/samba/tests/auth_log_pass_change.py
-index 972af2158dd..1ca46c586b3 100644
---- a/python/samba/tests/auth_log_pass_change.py
-+++ b/python/samba/tests/auth_log_pass_change.py
-@@ -72,6 +72,18 @@ class AuthLogPassChangeTests(samba.tests.auth_log_base.AuthLogTestBase):
- 
-         # discard any auth log messages for the password setup
-         self.discardMessages()
-+        gnutls_pbkdf2_support = samba.tests.env_get_var_value(
-+            'GNUTLS_PBKDF2_SUPPORT',
-+            allow_missing=True)
-+        if gnutls_pbkdf2_support is None:
-+            gnutls_pbkdf2_support = '0'
-+        self.gnutls_pbkdf2_support = bool(int(gnutls_pbkdf2_support))
-+
-+    def _authDescription(self):
-+        if self.gnutls_pbkdf2_support:
-+            return "samr_ChangePasswordUser4"
-+        else:
-+            return "samr_ChangePasswordUser3"
- 
-     def tearDown(self):
-         super(AuthLogPassChangeTests, self).tearDown()
-@@ -83,7 +95,7 @@ class AuthLogPassChangeTests(samba.tests.auth_log_base.AuthLogTestBase):
-                     (msg["Authentication"]["serviceDescription"] ==
-                         "SAMR Password Change") and
-                     (msg["Authentication"]["authDescription"] ==
--                        "samr_ChangePasswordUser3") and
-+                        self._authDescription()) and
-                     (msg["Authentication"]["eventId"] ==
-                         EVT_ID_SUCCESSFUL_LOGON) and
-                     (msg["Authentication"]["logonType"] ==
-@@ -109,7 +121,7 @@ class AuthLogPassChangeTests(samba.tests.auth_log_base.AuthLogTestBase):
-                     (msg["Authentication"]["serviceDescription"] ==
-                         "SAMR Password Change") and
-                     (msg["Authentication"]["authDescription"] ==
--                        "samr_ChangePasswordUser3") and
-+                        self._authDescription()) and
-                     (msg["Authentication"]["eventId"] ==
-                         EVT_ID_UNSUCCESSFUL_LOGON) and
-                     (msg["Authentication"]["logonType"] ==
-@@ -141,7 +153,7 @@ class AuthLogPassChangeTests(samba.tests.auth_log_base.AuthLogTestBase):
-                     (msg["Authentication"]["serviceDescription"] ==
-                         "SAMR Password Change") and
-                     (msg["Authentication"]["authDescription"] ==
--                        "samr_ChangePasswordUser3") and
-+                        self._authDescription()) and
-                     (msg["Authentication"]["eventId"] ==
-                         EVT_ID_UNSUCCESSFUL_LOGON) and
-                     (msg["Authentication"]["logonType"] ==
-@@ -174,7 +186,7 @@ class AuthLogPassChangeTests(samba.tests.auth_log_base.AuthLogTestBase):
-                     (msg["Authentication"]["serviceDescription"] ==
-                         "SAMR Password Change") and
-                     (msg["Authentication"]["authDescription"] ==
--                        "samr_ChangePasswordUser3") and
-+                        self._authDescription()) and
-                     (msg["Authentication"]["eventId"] ==
-                         EVT_ID_UNSUCCESSFUL_LOGON) and
-                     (msg["Authentication"]["logonType"] ==
-diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
-index a803d4704ea..c92105586a7 100755
---- a/source4/selftest/tests.py
-+++ b/source4/selftest/tests.py
-@@ -1094,9 +1094,11 @@ if have_heimdal_support:
-                            environ={'CLIENT_IP': '10.53.57.11',
-                                     'SOCKET_WRAPPER_DEFAULT_IFACE': 11})
-     planoldpythontestsuite("ad_dc_smb1", "samba.tests.auth_log_pass_change",
--                           extra_args=['-U"$USERNAME%$PASSWORD"'])
-+                           extra_args=['-U"$USERNAME%$PASSWORD"'],
-+                           environ={'GNUTLS_PBKDF2_SUPPORT': gnutls_pbkdf2_support})
-     planoldpythontestsuite("ad_dc_ntvfs", "samba.tests.auth_log_pass_change",
--                           extra_args=['-U"$USERNAME%$PASSWORD"'])
-+                           extra_args=['-U"$USERNAME%$PASSWORD"'],
-+                           environ={'GNUTLS_PBKDF2_SUPPORT': gnutls_pbkdf2_support})
- 
-     # these tests use a NCA local RPC connection, so always run on the
-     # :local testenv, and so don't need to fake a client connection
-@@ -1113,7 +1115,8 @@ if have_heimdal_support:
-                            "samba.tests.auth_log_winbind",
-                            extra_args=['-U"$DC_USERNAME%$DC_PASSWORD"'])
-     planoldpythontestsuite("ad_dc", "samba.tests.audit_log_pass_change",
--                           extra_args=['-U"$USERNAME%$PASSWORD"'])
-+                           extra_args=['-U"$USERNAME%$PASSWORD"'],
-+                           environ={'GNUTLS_PBKDF2_SUPPORT': gnutls_pbkdf2_support})
-     planoldpythontestsuite("ad_dc", "samba.tests.audit_log_dsdb",
-                            extra_args=['-U"$USERNAME%$PASSWORD"'])
-     planoldpythontestsuite("ad_dc", "samba.tests.group_audit",
--- 
-2.37.3
-

samba.logrotate

@@ -1,4 +1,4 @@
-/var/log/samba/log.* {
+/var/log/samba/*log* {
     compress
     dateext
     maxage 365

samba.spec

@@ -2,7 +2,7 @@
 #
 # To build and run the tests use:
 #
-# fedpkg local --with testsuite
+# fedpkg mockbuild --with testsuite
 # or
 # rpmbuild --rebuild --with testsuite samba.src.rpm
 #
@@ -10,12 +10,15 @@
 
 # Build with internal talloc, tevent, tdb and ldb.
 #
-# fedpkg local --with=testsuite --with=includelibs
+# fedpkg mockbuild --with=testsuite --with=includelibs
 # or
 # rpmbuild --rebuild --with=testsuite --with=includelibs samba.src.rpm
 #
 %bcond_with includelibs
 
+# fedpkg mockbuild --with=ccache
+%bcond_with ccache
+
 # ctdb is enabled by default, you can disable it with: --without clustering
 %bcond_without clustering
 
@@ -134,10 +137,10 @@
 
 %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.18.0
-%global baserelease 3
+%global samba_version 4.18.11
+%global baserelease 1
 # This should be rc1 or %%nil
-%global pre_release rc2
+%global pre_release %nil
 
 %global samba_release %{baserelease}
 %if "x%{?pre_release}" != "x"
@@ -170,8 +173,8 @@
 
 %global talloc_version 2.4.0
 %global tdb_version 1.4.8
-%global tevent_version 0.14.0
-%global ldb_version 2.7.0
+%global tevent_version 0.14.1
+%global ldb_version 2.7.2
 
 %global required_mit_krb5 1.20.1
 
@@ -210,7 +213,7 @@ Epoch:          0
 %global samba_depver %{epoch}:%{version}-%{release}
 
 Summary:        Server and Client software to interoperate with Windows machines
-License:        GPLv3+ and LGPLv3+
+License:        GPL-3.0-or-later AND LGPL-3.0-or-later
 URL:            https://www.samba.org
 
 # This is a xz recompressed file of https://ftp.samba.org/pub/samba/samba-%%{version}%%{pre_release}.tar.gz
@@ -270,6 +273,7 @@ Provides: bundled(libreplace)
 
 BuildRequires: make
 BuildRequires: gcc
+BuildRequires: glibc-gconv-extra
 BuildRequires: avahi-devel
 BuildRequires: bison
 BuildRequires: cups-devel
@@ -448,6 +452,8 @@ Requires: %{name}-common-libs = %{samba_depver}
 Requires: libwbclient = %{samba_depver}
 %endif
 Requires: krb5-libs >= %{required_mit_krb5}
+# This is needed for charset conversion
+Requires: glibc-gconv-extra
 
 %description client-libs
 The samba-client-libs package contains internal libraries needed by the
@@ -511,7 +517,7 @@ SMB/CIFS clients.
 
 ### COMMON-TOOLS
 %package common-tools
-Summary: Tools for Samba servers and clients
+Summary: Tools for Samba clients
 Requires: samba-common-libs = %{samba_depver}
 Requires: samba-client-libs = %{samba_depver}
 Requires: samba-libs = %{samba_depver}
@@ -521,22 +527,28 @@ Requires: libnetapi = %{samba_depver}
 Requires: libwbclient = %{samba_depver}
 %endif
 
-# samba-tool needs python3-samba
-Requires: python3-%{name} = %{samba_depver}
-# samba-tool needs tdbbackup
-Requires: tdb-tools
-%if %{with dc}
-# samba-tool needs python3-samba-dc on a full build
-Requires: python3-%{name}-dc = %{samba_depver}
-# samba-tool needs mdb_copy for domain backup or upgrade provision
-Requires: lmdb
-%endif
-
 Provides: bundled(libreplace)
 
 %description common-tools
-The samba-common-tools package contains tools for Samba servers and
-SMB/CIFS clients.
+The samba-common-tools package contains tools for SMB/CIFS clients.
+
+### SAMBA-TOOLS
+%package tools
+Summary: Tools for Samba servers
+# samba-tool needs python3-samba
+Requires: python3-%{name} = %{samba_depver}
+# samba-tool needs python3-samba-dc also on non-dc build
+Requires: python3-%{name}-dc = %{samba_depver}
+%if %{with dc}
+# samba-tool needs mdb_copy and tdbackup for domain backup or upgrade provision
+Requires: lmdb
+Requires: tdb-tools
+Requires: python3-gpg
+%endif
+
+%description tools
+The samba-tools package contains tools for Samba servers
+and for GPO management on domain members.
 
 ### RPC
 %package dcerpc
@@ -560,6 +572,7 @@ Requires: %{name} = %{samba_depver}
 Requires: %{name}-client-libs = %{samba_depver}
 Requires: %{name}-common-libs = %{samba_depver}
 Requires: %{name}-common-tools = %{samba_depver}
+Requires: %{name}-tools = %{samba_depver}
 Requires: %{name}-libs = %{samba_depver}
 Requires: %{name}-dc-provision = %{samba_depver}
 Requires: %{name}-dc-libs = %{samba_depver}
@@ -580,6 +593,7 @@ Requires: python3-setproctitle
 Requires: python3-%{name} = %{samba_depver}
 Requires: python3-%{name}-dc = %{samba_depver}
 Requires: krb5-server >= %{required_mit_krb5}
+Requires: bind-utils
 
 Provides: samba4-dc = %{samba_depver}
 Obsoletes: samba4-dc < %{samba_depver}
@@ -815,6 +829,7 @@ suite.
 %package -n libwbclient
 Summary: The winbind client library
 Requires: %{name}-client-libs = %{samba_depver}
+Conflicts: sssd-libwbclient
 
 %description -n libwbclient
 The libwbclient package contains the winbind client library from the Samba
@@ -823,6 +838,7 @@ suite.
 %package -n libwbclient-devel
 Summary: Developer tools for the winbind library
 Requires: libwbclient = %{samba_depver}
+Conflicts: sssd-libwbclient-devel
 
 Provides: samba-winbind-devel = %{samba_depver}
 Obsoletes: samba-winbind-devel < %{samba_depver}
@@ -877,7 +893,6 @@ Requires: %{name}-libs = %{samba_depver}
 The python3-%{name}-test package contains the Python libraries used by the test suite of Samba.
 If you want to run full set of Samba tests, you need to install this package.
 
-%if %{with dc} || %{with testsuite}
 %package -n python3-samba-dc
 Summary: Samba Python libraries for Samba AD
 Requires: %{name}-client-libs = %{samba_depver}
@@ -887,7 +902,6 @@ Requires: python3-%{name} = %{samba_depver}
 %description -n python3-samba-dc
 The python3-%{name}-dc package contains the Python libraries needed by programs
 to manage Samba AD.
-%endif
 
 ### PIDL
 %package pidl
@@ -980,6 +994,7 @@ Requires(post): %{name}-client-libs = %{samba_depver}
 Requires: %{name}-libs = %{samba_depver}
 Requires(post): %{name}-libs = %{samba_depver}
 Requires: %{name}-winbind-modules = %{samba_depver}
+Suggests: %{name}-tools = %{samba_depver}
 
 %if %{with libwbclient}
 Requires(post): libwbclient = %{samba_depver}
@@ -1070,14 +1085,14 @@ necessary to communicate to the Winbind Daemon
 %if %{with winexe}
 %package winexe
 Summary: Samba Winexe Windows Binary
-License: GPLv3
+License: GPL-3.0-only
 Requires: %{name}-client-libs = %{samba_depver}
 Requires: %{name}-common-libs = %{samba_depver}
 
 Provides: bundled(libreplace)
 
 %description winexe
-Winexe is a Remote Windows®-command executor
+Winexe is a Remote Windows-command executor
 %endif
 
 ### CTDB
@@ -1252,6 +1267,15 @@ export python_LDFLAGS="$(echo ${LDFLAGS} | sed -e 's/-Wl,-z,defs//g')"
 export python_LDFLAGS="$(echo %{__global_ldflags} | sed -e 's/-Wl,-z,defs//g')"
 %endif
 
+# Add support for mock ccache plugin
+%if %{with ccache}
+CCACHE="$(command -v ccache)"
+if [ -n "${CCACHE}" ]; then
+    ${CCACHE} -s
+    export CC="${CCACHE} gcc"
+fi
+%endif
+
 %configure \
         --enable-fhs \
         --with-piddir=/run \
@@ -1337,17 +1361,6 @@ install -d -m 0755 %{buildroot}/%{_libdir}/samba
 install -d -m 0755 %{buildroot}/%{_libdir}/samba/ldb
 install -d -m 0755 %{buildroot}/%{_libdir}/pkgconfig
 
-# Move libwbclient.so* into private directory, it cannot be just libdir/samba
-# because samba uses rpath with this directory.
-install -d -m 0755 %{buildroot}/%{_libdir}/samba/wbclient
-mv %{buildroot}/%{_libdir}/libwbclient.so* %{buildroot}/%{_libdir}/samba/wbclient
-if [ ! -f %{buildroot}/%{_libdir}/samba/wbclient/libwbclient.so.%{libwbc_alternatives_version} ]
-then
-    echo "Expected libwbclient version not found, please check if version has changed."
-    exit -1
-fi
-
-
 touch %{buildroot}%{_libexecdir}/samba/cups_backend_smb
 
 # Install other stuff
@@ -1407,54 +1420,10 @@ touch %{buildroot}%{_libdir}/krb5/plugins/libkrb5/winbind_krb5_locator.so
 
 %if %{without dc} && %{without testsuite}
 for i in \
-    %{_libdir}/samba/libdfs-server-ad-samba4.so \
-    %{_libdir}/samba/libdsdb-garbage-collect-tombstones-samba4.so \
-    %{_libdir}/samba/libscavenge-dns-records-samba4.so \
     %{_mandir}/man8/samba.8 \
     %{_mandir}/man8/samba_downgrade_db.8 \
     %{_mandir}/man8/samba-gpupdate.8 \
     %{_unitdir}/samba.service \
-    %{python3_sitearch}/samba/dcerpc/dnsserver.*.so \
-    %{python3_sitearch}/samba/dnsserver.py \
-    %{python3_sitearch}/samba/domain_update.py \
-    %{python3_sitearch}/samba/forest_update.py \
-    %{python3_sitearch}/samba/kcc/__init__.py \
-    %{python3_sitearch}/samba/kcc/debug.py \
-    %{python3_sitearch}/samba/kcc/graph.py \
-    %{python3_sitearch}/samba/kcc/graph_utils.py \
-    %{python3_sitearch}/samba/kcc/kcc_utils.py \
-    %{python3_sitearch}/samba/kcc/ldif_import_export.py \
-    %{python3_sitearch}/samba/kcc/__pycache__/__init__.*.pyc \
-    %{python3_sitearch}/samba/kcc/__pycache__/debug.*.pyc \
-    %{python3_sitearch}/samba/kcc/__pycache__/graph.*.pyc \
-    %{python3_sitearch}/samba/kcc/__pycache__/graph_utils.*.pyc \
-    %{python3_sitearch}/samba/kcc/__pycache__/kcc_utils.*.pyc \
-    %{python3_sitearch}/samba/kcc/__pycache__/ldif_import_export.*.pyc \
-    %{python3_sitearch}/samba/ms_forest_updates_markdown.py \
-    %{python3_sitearch}/samba/ms_schema_markdown.py \
-    %{python3_sitearch}/samba/provision/__init__.py \
-    %{python3_sitearch}/samba/provision/backend.py \
-    %{python3_sitearch}/samba/provision/common.py \
-    %{python3_sitearch}/samba/provision/kerberos_implementation.py \
-    %{python3_sitearch}/samba/provision/kerberos.py \
-    %{python3_sitearch}/samba/provision/sambadns.py \
-    %{python3_sitearch}/samba/provision/__pycache__/__init__.*.pyc \
-    %{python3_sitearch}/samba/provision/__pycache__/backend.*.pyc \
-    %{python3_sitearch}/samba/provision/__pycache__/common.*.pyc \
-    %{python3_sitearch}/samba/provision/__pycache__/kerberos_implementation.*.pyc \
-    %{python3_sitearch}/samba/provision/__pycache__/kerberos.*.pyc \
-    %{python3_sitearch}/samba/provision/__pycache__/sambadns.*.pyc \
-    %{python3_sitearch}/samba/__pycache__/domain_update.*.pyc \
-    %{python3_sitearch}/samba/__pycache__/forest_update.*.pyc \
-    %{python3_sitearch}/samba/__pycache__/ms_forest_updates_markdown.*.pyc \
-    %{python3_sitearch}/samba/__pycache__/ms_schema_markdown.*.pyc \
-    %{python3_sitearch}/samba/__pycache__/remove_dc.*.pyc \
-    %{python3_sitearch}/samba/__pycache__/schema.*.pyc \
-    %{python3_sitearch}/samba/__pycache__/uptodateness.*.pyc \
-    %{python3_sitearch}/samba/remove_dc.py \
-    %{python3_sitearch}/samba/samdb.py \
-    %{python3_sitearch}/samba/schema.py \
-    %{python3_sitearch}/samba/uptodateness.py \
     %{_sbindir}/samba-gpupdate \
     ; do
     rm -f %{buildroot}$i
@@ -1598,52 +1567,13 @@ fi
 %endif
 
 %if %{with libwbclient}
-%posttrans -n libwbclient
-# It has to be posttrans here to make sure all files of a previous version
-# without alternatives support are removed
-%{_sbindir}/update-alternatives \
-        --install \
-        %{_libdir}/libwbclient.so.%{libwbc_alternatives_version} \
-        libwbclient.so.%{libwbc_alternatives_version}%{libwbc_alternatives_suffix} \
-        %{_libdir}/samba/wbclient/libwbclient.so.%{libwbc_alternatives_version} \
-        10
+%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*
+fi
 %{?ldconfig}
-
-%preun -n libwbclient
-if [ $1 -eq 0 ]; then
-    %{_sbindir}/update-alternatives \
-            --remove \
-            libwbclient.so.%{libwbc_alternatives_version}%{libwbc_alternatives_suffix} \
-            %{_libdir}/samba/wbclient/libwbclient.so.%{libwbc_alternatives_version}
-fi
-/sbin/ldconfig
-
-%posttrans -n libwbclient-devel
-%{_sbindir}/update-alternatives \
-        --install %{_libdir}/libwbclient.so \
-        libwbclient.so%{libwbc_alternatives_suffix} \
-        %{_libdir}/samba/wbclient/libwbclient.so \
-        10
-
-%preun -n libwbclient-devel
-# alternatives checks if the file which should be removed is a link or not, but
-# not if it points to the /etc/alternatives directory or to some other place.
-# When downgrading to a version where alternatives is not used and
-# libwbclient.so is a link and not a file it will be removed. The following
-# check removes the alternatives files manually if that is the case.
-if [ $1 -eq 0 ]; then
-    if [ "`readlink %{_libdir}/libwbclient.so`" == "libwbclient.so.%{libwbc_alternatives_version}" ]; then
-        /bin/rm -f \
-            /etc/alternatives/libwbclient.so%{libwbc_alternatives_suffix} \
-            /var/lib/alternatives/libwbclient.so%{libwbc_alternatives_suffix} 2> /dev/null
-    else
-        %{_sbindir}/update-alternatives \
-            --remove \
-            libwbclient.so%{libwbc_alternatives_suffix} \
-            %{_libdir}/samba/wbclient/libwbclient.so
-    fi
-fi
-
 #endif {with libwbclient}
 %endif
 
@@ -1990,6 +1920,7 @@ fi
 %{_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
@@ -2069,11 +2000,11 @@ fi
 %{_libdir}/samba/pdb/smbpasswd.so
 %{_libdir}/samba/pdb/tdbsam.so
 
+### COMMON-TOOLS
 %files common-tools
 %{_bindir}/net
 %{_bindir}/pdbedit
 %{_bindir}/profiles
-%{_bindir}/samba-tool
 %{_bindir}/smbcontrol
 %{_bindir}/smbpasswd
 %{_bindir}/testparm
@@ -2082,9 +2013,13 @@ fi
 %{_mandir}/man1/testparm.1*
 %{_mandir}/man8/net.8*
 %{_mandir}/man8/pdbedit.8*
-%{_mandir}/man8/samba-tool.8*
 %{_mandir}/man8/smbpasswd.8*
 
+### TOOLS
+%files tools
+%{_bindir}/samba-tool
+%{_mandir}/man8/samba-tool.8*
+
 ### RPC
 %files dcerpc
 %dir %{_libexecdir}/samba
@@ -2094,7 +2029,9 @@ fi
 %{_libexecdir}/samba/rpcd_fsrvp
 %{_libexecdir}/samba/rpcd_lsad
 %{_libexecdir}/samba/rpcd_mdssvc
+%if %{with testsuite}
 %{_libexecdir}/samba/rpcd_rpcecho
+%endif
 %{_libexecdir}/samba/rpcd_spoolss
 %{_libexecdir}/samba/rpcd_winreg
 %{_mandir}/man8/samba-dcerpcd.8*
@@ -2411,7 +2348,6 @@ fi
 %{_libdir}/samba/libdnsserver-common-samba4.so
 %{_libdir}/samba/libshares-samba4.so
 %{_libdir}/samba/libsmbpasswdparser-samba4.so
-%{_libdir}/samba/libstable-sort-samba4.so
 %{_libdir}/samba/libxattr-tdb-samba4.so
 %{_libdir}/samba/libREG-FULL-samba4.so
 %{_libdir}/samba/libRPC-SERVER-LOOP-samba4.so
@@ -2444,12 +2380,12 @@ fi
 ### LIBWBCLIENT
 %if %{with libwbclient}
 %files -n libwbclient
-%{_libdir}/samba/wbclient/libwbclient.so.%{libwbclient_so_version}*
+%{_libdir}/libwbclient.so.%{libwbclient_so_version}*
 
 ### LIBWBCLIENT-DEVEL
 %files -n libwbclient-devel
 %{_includedir}/samba-4.0/wbclient.h
-%{_libdir}/samba/wbclient/libwbclient.so
+%{_libdir}/libwbclient.so
 %{_libdir}/pkgconfig/wbclient.pc
 #endif {with libwbclient}
 %endif
@@ -2805,7 +2741,6 @@ fi
 %{_libdir}/libsamba-policy.*.so
 %{_libdir}/pkgconfig/samba-policy.*.pc
 
-%if %{with dc} || %{with testsuite}
 %files -n python3-%{name}-dc
 %{python3_sitearch}/samba/samdb.py
 %{python3_sitearch}/samba/schema.py
@@ -2821,7 +2756,9 @@ fi
 %{python3_sitearch}/samba/__pycache__/uptodateness.*.pyc
 
 %{python3_sitearch}/samba/dcerpc/dnsserver.*.so
+%if %{with dc} || %{with testsuite}
 %{python3_sitearch}/samba/dckeytab.*.so
+%endif
 %{python3_sitearch}/samba/domain_update.py
 %{python3_sitearch}/samba/forest_update.py
 %{python3_sitearch}/samba/ms_forest_updates_markdown.py
@@ -2862,7 +2799,6 @@ fi
 
 %{python3_sitearch}/samba/remove_dc.py
 %{python3_sitearch}/samba/uptodateness.py
-%endif
 
 %files -n python3-%{name}-test
 %dir %{python3_sitearch}/samba/tests
@@ -3383,6 +3319,7 @@ fi
 %{_mandir}/man1/smbtorture.1*
 
 %if %{with testsuite}
+%{_mandir}/man1/vfstest.1*
 # files to ignore in testsuite mode
 %{_libdir}/samba/libnss-wrapper.so
 %{_libdir}/samba/libsocket-wrapper.so
@@ -3600,7 +3537,10 @@ fi
 %{_libexecdir}/ctdb/tests/sock_io_test
 %{_libexecdir}/ctdb/tests/srvid_test
 %{_libexecdir}/ctdb/tests/system_socket_test
+%{_libexecdir}/ctdb/tests/tmon_ping_test
+%{_libexecdir}/ctdb/tests/tmon_test
 %{_libexecdir}/ctdb/tests/transaction_loop
+%{_libexecdir}/ctdb/tests/tunable_test
 %{_libexecdir}/ctdb/tests/tunnel_cmd
 %{_libexecdir}/ctdb/tests/tunnel_test
 %{_libexecdir}/ctdb/tests/update_record
@@ -3687,13 +3627,19 @@ fi
 %{_datadir}/ctdb/tests/INTEGRATION/simple/basics.005.process_exists.sh
 %{_datadir}/ctdb/tests/INTEGRATION/simple/basics.010.statistics.sh
 %{_datadir}/ctdb/tests/INTEGRATION/simple/basics.011.statistics_reset.sh
-%{_datadir}/ctdb/tests/INTEGRATION/simple/cluster.002.recmaster_yield.sh
+%{_datadir}/ctdb/tests/INTEGRATION/simple/cluster.001.stop_leader_yield.sh
+%{_datadir}/ctdb/tests/INTEGRATION/simple/cluster.002.ban_leader_yield.sh
+%{_datadir}/ctdb/tests/INTEGRATION/simple/cluster.003.capability_leader_yield.sh
+%{_datadir}/ctdb/tests/INTEGRATION/simple/cluster.006.stop_leader_yield_no_lock.sh
+%{_datadir}/ctdb/tests/INTEGRATION/simple/cluster.007.ban_leader_yield_no_lock.sh
+%{_datadir}/ctdb/tests/INTEGRATION/simple/cluster.008.capability_leader_yield_no_lock.sh
 %{_datadir}/ctdb/tests/INTEGRATION/simple/cluster.010.getrelock.sh
 %{_datadir}/ctdb/tests/INTEGRATION/simple/cluster.012.reclock_command.sh
 %{_datadir}/ctdb/tests/INTEGRATION/simple/cluster.015.reclock_remove_lock.sh
 %{_datadir}/ctdb/tests/INTEGRATION/simple/cluster.016.reclock_move_lock_dir.sh
 %{_datadir}/ctdb/tests/INTEGRATION/simple/cluster.020.message_ring.sh
 %{_datadir}/ctdb/tests/INTEGRATION/simple/cluster.021.tunnel_ring.sh
+%{_datadir}/ctdb/tests/INTEGRATION/simple/cluster.030.node_stall_leader_timeout.sh
 %{_datadir}/ctdb/tests/INTEGRATION/simple/cluster.090.unreachable.sh
 %{_datadir}/ctdb/tests/INTEGRATION/simple/cluster.091.version_check.sh
 %{_datadir}/ctdb/tests/INTEGRATION/simple/debug.001.getdebug.sh
@@ -3719,6 +3665,7 @@ fi
 %{_datadir}/ctdb/tests/UNIT/cunit/cmdline_test_001.sh
 %{_datadir}/ctdb/tests/UNIT/cunit/comm_test_001.sh
 %{_datadir}/ctdb/tests/UNIT/cunit/comm_test_002.sh
+%{_datadir}/ctdb/tests/UNIT/cunit/conf_test_001.sh
 %{_datadir}/ctdb/tests/UNIT/cunit/config_test_001.sh
 %{_datadir}/ctdb/tests/UNIT/cunit/config_test_002.sh
 %{_datadir}/ctdb/tests/UNIT/cunit/config_test_003.sh
@@ -3726,7 +3673,6 @@ fi
 %{_datadir}/ctdb/tests/UNIT/cunit/config_test_005.sh
 %{_datadir}/ctdb/tests/UNIT/cunit/config_test_006.sh
 %{_datadir}/ctdb/tests/UNIT/cunit/config_test_007.sh
-%{_datadir}/ctdb/tests/UNIT/cunit/conf_test_001.sh
 %{_datadir}/ctdb/tests/UNIT/cunit/ctdb_io_test_001.sh
 %{_datadir}/ctdb/tests/UNIT/cunit/db_hash_test_001.sh
 %{_datadir}/ctdb/tests/UNIT/cunit/event_protocol_test_001.sh
@@ -3754,6 +3700,9 @@ fi
 %{_datadir}/ctdb/tests/UNIT/cunit/system_socket_test_001.sh
 %{_datadir}/ctdb/tests/UNIT/cunit/system_socket_test_002.sh
 %{_datadir}/ctdb/tests/UNIT/cunit/system_socket_test_003.sh
+%{_datadir}/ctdb/tests/UNIT/cunit/tmon_test_001.sh
+%{_datadir}/ctdb/tests/UNIT/cunit/tmon_test_002.sh
+%{_datadir}/ctdb/tests/UNIT/cunit/tunable_test_001.sh
 %dir %{_datadir}/ctdb/tests/UNIT/eventd
 %dir %{_datadir}/ctdb/tests/UNIT/eventd/etc-ctdb
 %{_datadir}/ctdb/tests/UNIT/eventd/etc-ctdb/ctdb.conf
@@ -3824,10 +3773,6 @@ fi
 %{_datadir}/ctdb/tests/UNIT/eventscripts/00.ctdb.init.007.sh
 %{_datadir}/ctdb/tests/UNIT/eventscripts/00.ctdb.init.008.sh
 %{_datadir}/ctdb/tests/UNIT/eventscripts/00.ctdb.init.009.sh
-%{_datadir}/ctdb/tests/UNIT/eventscripts/00.ctdb.setup.001.sh
-%{_datadir}/ctdb/tests/UNIT/eventscripts/00.ctdb.setup.002.sh
-%{_datadir}/ctdb/tests/UNIT/eventscripts/00.ctdb.setup.003.sh
-%{_datadir}/ctdb/tests/UNIT/eventscripts/00.ctdb.setup.004.sh
 %{_datadir}/ctdb/tests/UNIT/eventscripts/01.reclock.init.001.sh
 %{_datadir}/ctdb/tests/UNIT/eventscripts/01.reclock.init.002.sh
 %{_datadir}/ctdb/tests/UNIT/eventscripts/01.reclock.init.003.sh
@@ -4004,6 +3949,22 @@ fi
 %{_datadir}/ctdb/tests/UNIT/eventscripts/91.lvs.shutdown.002.sh
 %{_datadir}/ctdb/tests/UNIT/eventscripts/91.lvs.startup.001.sh
 %{_datadir}/ctdb/tests/UNIT/eventscripts/91.lvs.startup.002.sh
+%{_datadir}/ctdb/tests/UNIT/eventscripts/debug_locks.sh.001.sh
+%{_datadir}/ctdb/tests/UNIT/eventscripts/debug_locks.sh.002.sh
+%{_datadir}/ctdb/tests/UNIT/eventscripts/debug_locks.sh.003.sh
+%{_datadir}/ctdb/tests/UNIT/eventscripts/debug_locks.sh.004.sh
+%{_datadir}/ctdb/tests/UNIT/eventscripts/debug_locks.sh.005.sh
+%{_datadir}/ctdb/tests/UNIT/eventscripts/debug_locks.sh.006.sh
+%{_datadir}/ctdb/tests/UNIT/eventscripts/debug_locks.sh.007.sh
+%{_datadir}/ctdb/tests/UNIT/eventscripts/debug_locks.sh.008.sh
+%{_datadir}/ctdb/tests/UNIT/eventscripts/debug_locks.sh.021.sh
+%{_datadir}/ctdb/tests/UNIT/eventscripts/debug_locks.sh.022.sh
+%{_datadir}/ctdb/tests/UNIT/eventscripts/debug_locks.sh.023.sh
+%{_datadir}/ctdb/tests/UNIT/eventscripts/debug_locks.sh.024.sh
+%{_datadir}/ctdb/tests/UNIT/eventscripts/debug_locks.sh.025.sh
+%{_datadir}/ctdb/tests/UNIT/eventscripts/debug_locks.sh.026.sh
+%{_datadir}/ctdb/tests/UNIT/eventscripts/debug_locks.sh.027.sh
+%{_datadir}/ctdb/tests/UNIT/eventscripts/debug_locks.sh.028.sh
 %dir %{_datadir}/ctdb/tests/UNIT/eventscripts/etc
 %dir %{_datadir}/ctdb/tests/UNIT/eventscripts/etc-ctdb
 %{_datadir}/ctdb/tests/UNIT/eventscripts/etc-ctdb/public_addresses
@@ -4033,6 +3994,7 @@ fi
 %{_datadir}/ctdb/tests/UNIT/eventscripts/scripts/50.samba.sh
 %{_datadir}/ctdb/tests/UNIT/eventscripts/scripts/60.nfs.sh
 %{_datadir}/ctdb/tests/UNIT/eventscripts/scripts/91.lvs.sh
+%{_datadir}/ctdb/tests/UNIT/eventscripts/scripts/debug_locks.sh
 %{_datadir}/ctdb/tests/UNIT/eventscripts/scripts/local.sh
 %{_datadir}/ctdb/tests/UNIT/eventscripts/scripts/statd-callout.sh
 %{_datadir}/ctdb/tests/UNIT/eventscripts/statd-callout.001.sh
@@ -4052,6 +4014,7 @@ fi
 %{_datadir}/ctdb/tests/UNIT/eventscripts/stubs/df
 %{_datadir}/ctdb/tests/UNIT/eventscripts/stubs/ethtool
 %{_datadir}/ctdb/tests/UNIT/eventscripts/stubs/exportfs
+%{_datadir}/ctdb/tests/UNIT/eventscripts/stubs/gstack
 %{_datadir}/ctdb/tests/UNIT/eventscripts/stubs/id
 %{_datadir}/ctdb/tests/UNIT/eventscripts/stubs/ip
 %{_datadir}/ctdb/tests/UNIT/eventscripts/stubs/ip6tables
@@ -4060,21 +4023,24 @@ fi
 %{_datadir}/ctdb/tests/UNIT/eventscripts/stubs/kill
 %{_datadir}/ctdb/tests/UNIT/eventscripts/stubs/killall
 %{_datadir}/ctdb/tests/UNIT/eventscripts/stubs/multipath
-%{_datadir}/ctdb/tests/UNIT/eventscripts/stubs/nfsconf
 %{_datadir}/ctdb/tests/UNIT/eventscripts/stubs/net
+%{_datadir}/ctdb/tests/UNIT/eventscripts/stubs/nfs-fake-callout
+%{_datadir}/ctdb/tests/UNIT/eventscripts/stubs/nfsconf
 %{_datadir}/ctdb/tests/UNIT/eventscripts/stubs/pidof
 %{_datadir}/ctdb/tests/UNIT/eventscripts/stubs/pkill
 %{_datadir}/ctdb/tests/UNIT/eventscripts/stubs/ps
 %{_datadir}/ctdb/tests/UNIT/eventscripts/stubs/rm
-%{_datadir}/ctdb/tests/UNIT/eventscripts/stubs/rpcinfo
 %{_datadir}/ctdb/tests/UNIT/eventscripts/stubs/rpc.lockd
 %{_datadir}/ctdb/tests/UNIT/eventscripts/stubs/rpc.mountd
 %{_datadir}/ctdb/tests/UNIT/eventscripts/stubs/rpc.rquotad
 %{_datadir}/ctdb/tests/UNIT/eventscripts/stubs/rpc.statd
+%{_datadir}/ctdb/tests/UNIT/eventscripts/stubs/rpcinfo
 %{_datadir}/ctdb/tests/UNIT/eventscripts/stubs/service
 %{_datadir}/ctdb/tests/UNIT/eventscripts/stubs/sleep
 %{_datadir}/ctdb/tests/UNIT/eventscripts/stubs/smnotify
 %{_datadir}/ctdb/tests/UNIT/eventscripts/stubs/ss
+%{_datadir}/ctdb/tests/UNIT/eventscripts/stubs/stat
+%{_datadir}/ctdb/tests/UNIT/eventscripts/stubs/tdb_mutex_check
 %{_datadir}/ctdb/tests/UNIT/eventscripts/stubs/tdbdump
 %{_datadir}/ctdb/tests/UNIT/eventscripts/stubs/tdbtool
 %{_datadir}/ctdb/tests/UNIT/eventscripts/stubs/testparm
@@ -4102,7 +4068,6 @@ fi
 %{_datadir}/ctdb/tests/UNIT/onnode/stubs/ssh
 %dir %{_datadir}/ctdb/tests/UNIT/shellcheck
 %{_datadir}/ctdb/tests/UNIT/shellcheck/base_scripts.sh
-%{_datadir}/ctdb/tests/UNIT/shellcheck/ctdbd_wrapper.sh
 %{_datadir}/ctdb/tests/UNIT/shellcheck/ctdb_helpers.sh
 %{_datadir}/ctdb/tests/UNIT/shellcheck/event_scripts.sh
 %{_datadir}/ctdb/tests/UNIT/shellcheck/functions.sh
@@ -4237,6 +4202,8 @@ fi
 %{_datadir}/ctdb/tests/UNIT/tool/ctdb.ipinfo.001.sh
 %{_datadir}/ctdb/tests/UNIT/tool/ctdb.ipinfo.002.sh
 %{_datadir}/ctdb/tests/UNIT/tool/ctdb.ipinfo.003.sh
+%{_datadir}/ctdb/tests/UNIT/tool/ctdb.leader.001.sh
+%{_datadir}/ctdb/tests/UNIT/tool/ctdb.leader.002.sh
 %{_datadir}/ctdb/tests/UNIT/tool/ctdb.listnodes.001.sh
 %{_datadir}/ctdb/tests/UNIT/tool/ctdb.listnodes.002.sh
 %{_datadir}/ctdb/tests/UNIT/tool/ctdb.listvars.001.sh
@@ -4264,6 +4231,7 @@ fi
 %{_datadir}/ctdb/tests/UNIT/tool/ctdb.nodestatus.004.sh
 %{_datadir}/ctdb/tests/UNIT/tool/ctdb.nodestatus.005.sh
 %{_datadir}/ctdb/tests/UNIT/tool/ctdb.nodestatus.006.sh
+%{_datadir}/ctdb/tests/UNIT/tool/ctdb.nodestatus.007.sh
 %{_datadir}/ctdb/tests/UNIT/tool/ctdb.pdelete.001.sh
 %{_datadir}/ctdb/tests/UNIT/tool/ctdb.ping.001.sh
 %{_datadir}/ctdb/tests/UNIT/tool/ctdb.pnn.001.sh
@@ -4273,8 +4241,6 @@ fi
 %{_datadir}/ctdb/tests/UNIT/tool/ctdb.pstore.001.sh
 %{_datadir}/ctdb/tests/UNIT/tool/ctdb.ptrans.001.sh
 %{_datadir}/ctdb/tests/UNIT/tool/ctdb.readkey.001.sh
-%{_datadir}/ctdb/tests/UNIT/tool/ctdb.recmaster.001.sh
-%{_datadir}/ctdb/tests/UNIT/tool/ctdb.recmaster.002.sh
 %{_datadir}/ctdb/tests/UNIT/tool/ctdb.recover.001.sh
 %{_datadir}/ctdb/tests/UNIT/tool/ctdb.reloadnodes.001.sh
 %{_datadir}/ctdb/tests/UNIT/tool/ctdb.reloadnodes.002.sh
@@ -4316,6 +4282,7 @@ fi
 %{_datadir}/ctdb/tests/UNIT/tool/ctdb.setvar.002.sh
 %{_datadir}/ctdb/tests/UNIT/tool/ctdb.status.001.sh
 %{_datadir}/ctdb/tests/UNIT/tool/ctdb.status.002.sh
+%{_datadir}/ctdb/tests/UNIT/tool/ctdb.status.003.sh
 %{_datadir}/ctdb/tests/UNIT/tool/ctdb.stop.001.sh
 %{_datadir}/ctdb/tests/UNIT/tool/ctdb.stop.002.sh
 %{_datadir}/ctdb/tests/UNIT/tool/ctdb.stop.003.sh
@@ -4368,6 +4335,92 @@ fi
 %endif
 
 %changelog
+* Wed Mar 13 2024 Guenther Deschner <gdeschner@redhat.com> - 4.18.11-1
+- Update to 4.18.11
+
+* Thu Feb 01 2024 Guenther Deschner <gdeschner@redhat.com> - 4.18.10-1
+- Update to 4.18.10
+
+* Thu Nov 30 2023 Guenther Deschner <gdeschner@redhat.com> - 4.18.9-1
+- Update to 4.18.9
+- resolves: #1625445, #2160799: Security fix for CVE-2018-14628
+
+* Tue Oct 10 2023 Guenther Deschner <gdeschner@redhat.com> - 4.18.8-1
+- Update to 4.18.8
+- resolves: #2241881, #2243228: Security fix for CVE-2023-3961
+- resolves: #2241882, #2243231: Security fix for CVE-2023-4091
+- resolves: #2241883, #2243230: Security fix for CVE-2023-4154
+- resolves: #2241884, #2243229: Security fix for CVE-2023-42669
+- resolves: #2241885, #2243232: Security fix for CVE-2023-42670
+
+* Wed Sep 27 2023 Guenther Deschner <gdeschner@redhat.com> - 4.18.7-1
+- Update to version 4.18.7
+
+* Thu Aug 17 2023 Andreas Schneider <asn@redhat.com> - 4.18.6-1
+- Update to version 4.18.6
+
+* Thu Jul 20 2023 Guenther Deschner <gdeschner@redhat.com> - 4.18.5-0
+- resolves: #2224040 - Update to version 4.18.5
+- resolves: #2222791, #2224254 - Security fix for CVE-2022-2127
+- resolves: #2222792, #2224255 - Security fix for CVE-2023-3347
+- resolves: #2222793, #2224253 - Security fix for CVE-2023-34966
+- resolves: #2222794, #2224252 - Security fix for CVE-2023-34967
+- resolves: #2222795, #2224250 - Security fix for CVE-2023-34968
+
+* Sat Jul 15 2023 Guenther Deschner <gdeschner@redhat.com> - 4.18.4-1
+- resolves: #2223091 - Fix netlogon LogonGetCapabilities level 2 error handling
+
+* Wed Jul 05 2023 Guenther Deschner <gdeschner@redhat.com> - 4.18.4-0
+- resolves: #2219799 - Update to version 4.18.4
+
+* Mon Jun 26 2023 Adam Williamson <awilliam@redhat.com> - 4.18.3-4
+- Only run libwbclient %pre on upgrade, not fresh install
+
+* Fri Jun 23 2023 Andreas Schneider <asn@redhat.com> - 4.18.3-3
+- resolves: rhbz#2211577 - Fix libwbclient package upgrades
+
+* Thu Jun 15 2023 Python Maint <python-maint@redhat.com> - 2:4.18.3-2
+- Rebuilt for Python 3.12
+
+* Thu Jun 15 2023 Andreas Schneider <asn@redhat.com> - 4.18.3-1
+- resolves: #2203539 - Also cover mit_kdc.log by logrotate
+
+* Thu Jun 01 2023 Guenther Deschner <gdeschner@redhat.com> - 4.18.3-0
+- resolves: #2211453 - Update to version 4.18.3
+
+* Wed Apr 19 2023 Guenther Deschner <gdeschner@redhat.com> - 4.18.2-0
+- resolves: #2187991 - Update to version 4.18.2
+
+* Wed Mar 29 2023 Guenther Deschner <gdeschner@redhat.com> - 4.18.1-0
+- resolves: #2182787 - Update to version 4.18.1
+- resolves: #2182772, #2182773 - Security fixes for CVE-2023-0225
+- resolves: #2182774, #2182775 - Security fixes for CVE-2023-0922
+- resolves: #2182776, #2182777 - Security fixes for CVE-2023-0614
+
+* Tue Mar 21 2023 Andreas Schneider <asn@redhat.com> - 4.18.0-12
+- Fix ctdb file lists when built with test suite enabled
+
+* Fri Mar 17 2023 Kalev Lember <klember@redhat.com> - 4.18.0-10
+- Move libstable-sort-samba4.so to samba-client-libs subpackage
+
+* Wed Mar 08 2023 Guenther Deschner <gdeschner@redhat.com> - 4.18.0-9
+- resolves: #2176469 - Update to version 4.18.0
+
+* Wed Mar 01 2023 Guenther Deschner <gdeschner@redhat.com> - 4.18.0rc4-8
+- resolves: #2174415 - Update to version 4.18.0rc4
+
+* Tue Feb 28 2023 Andreas Schneider <asn@redhat.com> - 4.18.0-0.7.rc3
+- resolves: #2173619 - Add missing Requires for glibc-gconv-extra
+
+* Thu Feb 23 2023 Pavel Filipenský <pfilipen@redhat.com> - 4.18.0-0.6.rc3
+- SPDX migration
+
+* Wed Feb 15 2023 Guenther Deschner <gdeschner@redhat.com> - 4.18.0rc3-6
+- resolves: #2166416 - Update to version 4.18.0rc3
+
+* Tue Feb 14 2023 Pavel Filipenský <pfilipen@redhat.com> - 4.18.0rc2-4
+- resolves: rhbz#2166124 - Create package samba-tools, move there samba-tool binary
+
 * Thu Feb 02 2023 Guenther Deschner <gdeschner@redhat.com> - 4.18.0rc2-3
 - resolves: #2166416 - Update to version 4.18.0rc2
 

sources

@@ -1,2 +1,2 @@
-SHA512 (samba-4.18.0rc2.tar.xz) = 1467ee97c5861e7306d2bf96c0c600404212d9b241cc28e5fb649f8297bdb3bb86a774cb78ccfc82a70f7b715eff7eb0de9dc3563ba0300c6a069d9609fbdef4
-SHA512 (samba-4.18.0rc2.tar.asc) = 557eec6485669b172b16fd5032750d8cfa8058d1615316d7e539924d561d7d7e7d0990bcf62f96d0ec467c8fc5e59c0bb8ea1a963396055b6af8659e166073cd
+SHA512 (samba-4.18.11.tar.xz) = 96c90d249316d5c609041366a476996f227a97d2b36b6b06b2e7fb45efc3088d5bf8b9be5e078e483141a2ee31b47496dc8eff4ecefae0542cf87541bbb14c06
+SHA512 (samba-4.18.11.tar.asc) = e18915c229fb67d1cb401802c0bfd54d0a77f42f418c8c84a5408237b59f95421221b35d577e052e127b80ac419bea50c5f6924ef2bfef36fec26fa6c9858400