diff --git a/SOURCES/samba-4.13-redhat.patch b/SOURCES/samba-4.13-redhat.patch
index 4eafe4b..aa31e80 100644
--- a/SOURCES/samba-4.13-redhat.patch
+++ b/SOURCES/samba-4.13-redhat.patch
@@ -1,7 +1,7 @@
From 2700da00069cd2d1977c291a4f39a2d4733ded7e Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Mon, 13 Jul 2020 16:15:03 +0200
-Subject: [PATCH 001/105] libcli:smb2: Do not leak ptext on error
+Subject: [PATCH 001/108] libcli:smb2: Do not leak ptext on error
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
@@ -28,7 +28,7 @@ index cc03607d789..4d430f56df5 100644
From efeefe63206b9663bfc1dc5418c294831a96d1ee Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Mon, 13 Jul 2020 17:23:37 +0200
-Subject: [PATCH 002/105] libcli:smb2: Use talloc NULL context if we don't have
+Subject: [PATCH 002/108] libcli:smb2: Use talloc NULL context if we don't have
a stackframe
If we execute this code from python we don't have a talloc stackframe
@@ -112,7 +112,7 @@ index 4d430f56df5..6ece5f2e4d3 100644
From 189ec5ea334188d0473fca9ffe2fe4887c5f804e Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 6 Nov 2019 17:37:45 +0100
-Subject: [PATCH 003/105] auth:creds: Introduce CRED_SMB_CONF
+Subject: [PATCH 003/108] auth:creds: Introduce CRED_SMB_CONF
We have several places where we check '> CRED_UNINITIALISED',
so we better don't use CRED_UNINITIALISED for values from
@@ -208,7 +208,7 @@ index d2a81506de3..6454ac9ff7c 100644
From 50499847d67b8c7a9f1f95f94f5c4cc0c3c38ab3 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Thu, 10 Oct 2019 14:18:23 +0200
-Subject: [PATCH 004/105] param: Add 'server smb encrypt' parameter
+Subject: [PATCH 004/108] param: Add 'server smb encrypt' parameter
And this also makes 'smb encrypt' a synonym of that.
@@ -827,7 +827,7 @@ index 7acde285a90..b745e0906b1 100644
From 74d2e7f5c8892393ebda43009bbd2c781eed275f Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Thu, 28 May 2020 10:04:19 +0200
-Subject: [PATCH 005/105] param: Create and use enum_smb_encryption_vals
+Subject: [PATCH 005/108] param: Create and use enum_smb_encryption_vals
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
@@ -925,7 +925,7 @@ index b424b13cde4..2fb1fd7189e 100644
From 41d2569830352ad837a7066726870a29657978ac Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Tue, 26 May 2020 09:34:54 +0200
-Subject: [PATCH 006/105] s3:smbd: Use 'enum smb_encryption_setting' values
+Subject: [PATCH 006/108] s3:smbd: Use 'enum smb_encryption_setting' values
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
@@ -1049,7 +1049,7 @@ index b745e0906b1..2f2fdcb7260 100644
From c1d582d192afb200c4ad3fc6c8109789c3266a75 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Thu, 9 Apr 2020 10:38:41 +0200
-Subject: [PATCH 007/105] docs-xml: Add 'client smb encrypt'
+Subject: [PATCH 007/108] docs-xml: Add 'client smb encrypt'
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
@@ -1227,7 +1227,7 @@ index 4ad541301b3..6418a42b6eb 100644
From ffe01bcd6390b3ca19c6e327175c262f76683aea Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Wed, 22 Jul 2020 17:48:25 +0200
-Subject: [PATCH 008/105] lib:param: Add lpcfg_parse_enum_vals()
+Subject: [PATCH 008/108] lib:param: Add lpcfg_parse_enum_vals()
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
@@ -1294,7 +1294,7 @@ index 323fcf84523..e66ce2324b4 100644
From be3b71c7877bda0e5a578b76bfcf98ab9c8e4894 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Wed, 9 Oct 2019 09:38:08 +0200
-Subject: [PATCH 009/105] libcli:smb: Add smb_signing_setting_translate()
+Subject: [PATCH 009/108] libcli:smb: Add smb_signing_setting_translate()
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
@@ -1467,7 +1467,7 @@ index 6918e1306c3..20981754db4 100644
From 523033ebfca0154cf13fe79796a879797bf61c66 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Tue, 26 May 2020 08:39:34 +0200
-Subject: [PATCH 010/105] libcli:smb: Add smb_encryption_setting_translate()
+Subject: [PATCH 010/108] libcli:smb: Add smb_encryption_setting_translate()
Add encryption enum and function to avoid confusion when reading the
code.
@@ -1561,7 +1561,7 @@ index da0e4db2bf3..ac2887ee5c4 100644
From b6f83efae214538df1965df7d2577c5ebd2926a3 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Wed, 9 Oct 2019 09:47:59 +0200
-Subject: [PATCH 011/105] s3:lib: Use smb_signing_setting_translate for cmdline
+Subject: [PATCH 011/108] s3:lib: Use smb_signing_setting_translate for cmdline
parsing
The function will be removed soon.
@@ -1628,7 +1628,7 @@ index 5a07eddac44..6a08afe4a25 100644
From f7f4411902cdbfec5358339f4279cca44a9fb181 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Thu, 23 Jul 2020 07:47:18 +0200
-Subject: [PATCH 012/105] auth:creds: Remove unused credentials autoproto
+Subject: [PATCH 012/108] auth:creds: Remove unused credentials autoproto
header
Signed-off-by: Andreas Schneider <asn@samba.org>
@@ -1708,7 +1708,7 @@ index 7711eac2afa..d9be3562adb 100644
From ae65707b4b6f0bb640ac6e9f5899d5908b6f5ee4 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Tue, 26 May 2020 09:32:44 +0200
-Subject: [PATCH 013/105] auth:creds: Add
+Subject: [PATCH 013/108] auth:creds: Add
cli_credentials_(get|set)_smb_signing()
Signed-off-by: Andreas Schneider <asn@samba.org>
@@ -1850,7 +1850,7 @@ index 68f1f25dce1..9cde0000b5f 100644
From 7408b2af20c3d3b3bf1a59850e9f4659d9379eed Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Wed, 3 Jun 2020 11:56:01 +0200
-Subject: [PATCH 014/105] auth:creds: Add python bindings for
+Subject: [PATCH 014/108] auth:creds: Add python bindings for
(get|set)_smb_signing
Signed-off-by: Andreas Schneider <asn@samba.org>
@@ -1976,7 +1976,7 @@ index 6454ac9ff7c..e5f8122fa21 100644
From b5753b24a1a8897c55189869c623977bb78430b0 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Thu, 28 May 2020 16:31:35 +0200
-Subject: [PATCH 015/105] auth:creds: Add
+Subject: [PATCH 015/108] auth:creds: Add
cli_credentials_(get|set)_smb_ipc_signing()
Signed-off-by: Andreas Schneider <asn@samba.org>
@@ -2108,7 +2108,7 @@ index 9cde0000b5f..54e8271471f 100644
From 1e7031e438992e37cb9324250d21e82c5f5324c6 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Wed, 3 Jun 2020 12:32:46 +0200
-Subject: [PATCH 016/105] auth:creds: Add python bindings for
+Subject: [PATCH 016/108] auth:creds: Add python bindings for
(get|set)_smb_ipc_signing
Signed-off-by: Andreas Schneider <asn@samba.org>
@@ -2213,7 +2213,7 @@ index e5f8122fa21..8edf13ce6ff 100644
From 8843b4072f5f1d27dea9742518cedbad543e137a Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Thu, 28 May 2020 16:10:52 +0200
-Subject: [PATCH 017/105] auth:creds: Add
+Subject: [PATCH 017/108] auth:creds: Add
cli_credentials_(get|set)_smb_encryption()
Signed-off-by: Andreas Schneider <asn@samba.org>
@@ -2347,7 +2347,7 @@ index 54e8271471f..3b86b742448 100644
From fa8fb414c21d7c823eb35130ecf05bd13cec3370 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Wed, 3 Jun 2020 12:38:30 +0200
-Subject: [PATCH 018/105] auth:creds: Add python bindings for
+Subject: [PATCH 018/108] auth:creds: Add python bindings for
(get|set)_smb_encryption
Signed-off-by: Andreas Schneider <asn@samba.org>
@@ -2465,7 +2465,7 @@ index 8edf13ce6ff..e0a6248d37a 100644
From 9029cd9abb9bbd668f6616821a99e79f31617ccf Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Thu, 4 Jun 2020 11:19:53 +0200
-Subject: [PATCH 019/105] auth:creds: Add python bindings for
+Subject: [PATCH 019/108] auth:creds: Add python bindings for
cli_credentials_set_conf()
Signed-off-by: Andreas Schneider <asn@samba.org>
@@ -2593,7 +2593,7 @@ index e0a6248d37a..6187bded0b6 100644
From 3567e45ea254c8b8fd171174833e9a153f88a2ca Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Thu, 23 Jul 2020 08:14:23 +0200
-Subject: [PATCH 020/105] auth:creds: Bump library version
+Subject: [PATCH 020/108] auth:creds: Bump library version
We added new functions so bump the version.
@@ -2623,7 +2623,7 @@ index 564a04fe8dd..1e3302e3e48 100644
From e4b2962b34affec4cb9a4367faea53fe27c494e7 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Wed, 27 May 2020 11:10:30 +0200
-Subject: [PATCH 021/105] s3:lib: Use cli_credential_(get|set)_smb_signing()
+Subject: [PATCH 021/108] s3:lib: Use cli_credential_(get|set)_smb_signing()
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
@@ -2694,7 +2694,7 @@ index bc1f1c3ed25..6038ec11515 100644
From 1cabf0cd51019ae8d6d37c27b0b5aacc989d5818 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Wed, 10 Jun 2020 12:45:34 +0200
-Subject: [PATCH 022/105] s3:lib: Set smb encryption also via cli creds API
+Subject: [PATCH 022/108] s3:lib: Set smb encryption also via cli creds API
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
@@ -2723,7 +2723,7 @@ index 6038ec11515..9c9e2f0ac0f 100644
From 60af05cd7dd38dbb936df530d9255b7e829f5283 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Thu, 13 Aug 2020 10:40:23 +0200
-Subject: [PATCH 023/105] python: Remove unused sign argument from
+Subject: [PATCH 023/108] python: Remove unused sign argument from
smb_connection()
Signed-off-by: Andreas Schneider <asn@samba.org>
@@ -2778,7 +2778,7 @@ index 1e2c2918ebe..ad60cda0690 100644
From 061d5a2ddfe247494ca1bbd601e2eb63d0b26fe8 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Wed, 3 Jun 2020 14:02:37 +0200
-Subject: [PATCH 024/105] python: Set smb signing via the creds API
+Subject: [PATCH 024/108] python: Set smb signing via the creds API
Pair-Programmed-With: Stefan Metzmacher <metze@samba.org>
@@ -2882,7 +2882,7 @@ index ad60cda0690..0f2f6520fc3 100644
From d6e0f9079047c1832c981a0bf357e5e9415168d4 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Thu, 28 May 2020 17:22:12 +0200
-Subject: [PATCH 025/105] s3:libsmb: Introduce CLI_FULL_CONNECTION_IPC
+Subject: [PATCH 025/108] s3:libsmb: Introduce CLI_FULL_CONNECTION_IPC
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
@@ -3105,7 +3105,7 @@ index 6cea2ee306c..2241beb331f 100644
From 1a928ac9a29329588633058ef226098f118c3f87 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Thu, 28 May 2020 17:29:25 +0200
-Subject: [PATCH 026/105] s3:pylibsmb: Add ipc=True support for
+Subject: [PATCH 026/108] s3:pylibsmb: Add ipc=True support for
CLI_FULL_CONNECTION_IPC
Signed-off-by: Andreas Schneider <asn@samba.org>
@@ -3170,7 +3170,7 @@ index 3fcc3424a57..3579a040830 100644
From c06aed4a9d30a50c36787c57e091b34610d10a61 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Fri, 24 Jul 2020 09:47:11 +0200
-Subject: [PATCH 027/105] python:tests: Mark libsmb connection as an IPC
+Subject: [PATCH 027/108] python:tests: Mark libsmb connection as an IPC
connection
Signed-off-by: Andreas Schneider <asn@samba.org>
@@ -3199,7 +3199,7 @@ index ba7440df13b..2c028d381db 100644
From 94218e70119c343d747808f62c4f8acccabbf7a6 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Mon, 17 Aug 2020 12:52:39 +0200
-Subject: [PATCH 028/105] python:tests: Set smb ipc signing via the creds API
+Subject: [PATCH 028/108] python:tests: Set smb ipc signing via the creds API
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
@@ -3237,7 +3237,7 @@ index 2c028d381db..d6f5de7440a 100644
From 44a039e9373f5274a33b6eccfcb82c0a5e538818 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Thu, 28 May 2020 17:59:19 +0200
-Subject: [PATCH 029/105] s3:libsmb: Use 'enum smb_signing_setting' in
+Subject: [PATCH 029/108] s3:libsmb: Use 'enum smb_signing_setting' in
cliconnect.c
Signed-off-by: Andreas Schneider <asn@samba.org>
@@ -3367,7 +3367,7 @@ index d214cdabca4..995187e21b4 100644
From 797c0e55c8521a6788a98ecd405579e2d2d09b46 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Thu, 28 May 2020 18:11:31 +0200
-Subject: [PATCH 030/105] s3:client: Turn off smb signing for message op
+Subject: [PATCH 030/108] s3:client: Turn off smb signing for message op
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
@@ -3519,7 +3519,7 @@ index 3579a040830..f8a4d56cf53 100644
From ae84010726a6a428a1b1ad2ddddbf7dd9fd54d6f Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Thu, 28 May 2020 18:20:02 +0200
-Subject: [PATCH 031/105] s3:libsmb: Remove signing_state from
+Subject: [PATCH 031/108] s3:libsmb: Remove signing_state from
cli_full_connection_creds_send()
Signed-off-by: Andreas Schneider <asn@samba.org>
@@ -3618,7 +3618,7 @@ index f8a4d56cf53..c7a2d73afcb 100644
From 23dd3d7fd8e120be59bd0b45ea5bccb6812730d6 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Thu, 4 Jun 2020 14:59:14 +0200
-Subject: [PATCH 032/105] s3:libsmb: Remove signing_state from
+Subject: [PATCH 032/108] s3:libsmb: Remove signing_state from
cli_full_connection_creds()
Signed-off-by: Andreas Schneider <asn@samba.org>
@@ -3989,7 +3989,7 @@ index 954d6eba804..fea066ce468 100644
From fba11e893292fbbb03a85617c69326815dfdc996 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Mon, 8 Jun 2020 08:04:24 +0200
-Subject: [PATCH 033/105] s3:libsmb: Add encryption support to
+Subject: [PATCH 033/108] s3:libsmb: Add encryption support to
cli_full_connection_creds*()
Pair-Programmed-With: Andreas Schneider <asn@samba.org>
@@ -4206,7 +4206,7 @@ index b24743d789b..abfd18bfaf1 100644
From b6e55cb03a821baf2ed7e7e1e4a4ff8ced9aa549 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Wed, 10 Jun 2020 11:26:00 +0200
-Subject: [PATCH 034/105] python: Add a test for SMB encryption
+Subject: [PATCH 034/108] python: Add a test for SMB encryption
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
@@ -4280,7 +4280,7 @@ index e8f8e7fe94d..81d4e482644 100644
From 16113fa8ed57b2ec8d75e8ff0e653a264f28b75a Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Wed, 10 Jun 2020 12:31:02 +0200
-Subject: [PATCH 035/105] s3:net: Use cli_credentials_set_smb_encryption()
+Subject: [PATCH 035/108] s3:net: Use cli_credentials_set_smb_encryption()
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
@@ -4329,7 +4329,7 @@ index b139fb2d0da..5829d891075 100644
From fc775b9734466e9454db559b08704c308c5b310d Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Wed, 10 Jun 2020 12:40:13 +0200
-Subject: [PATCH 036/105] s3:libsmb: Use cli_credentials_set_smb_encryption()
+Subject: [PATCH 036/108] s3:libsmb: Use cli_credentials_set_smb_encryption()
This also adds a SMBC_ENCRYPTLEVEL_DEFAULT to 'enum
smbc_smb_encrypt_level' in order to use the smb.conf default value.
@@ -4688,7 +4688,7 @@ index ec4a516b2ee..61503d0a98b 100644
From 4f3adf58dded81470d654b36a6b41f44c97a0c1a Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Wed, 10 Jun 2020 12:43:33 +0200
-Subject: [PATCH 037/105] s3:client: Remove unused smb encryption code
+Subject: [PATCH 037/108] s3:client: Remove unused smb encryption code
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
@@ -4724,7 +4724,7 @@ index f56dc323b6e..16a8d44c069 100644
From 98fd48ab6736cbc5321da554cbdade876747c8b2 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Wed, 10 Jun 2020 12:47:05 +0200
-Subject: [PATCH 038/105] s3:utils: Remove obsolete force encryption from
+Subject: [PATCH 038/108] s3:utils: Remove obsolete force encryption from
smbacls
Signed-off-by: Andreas Schneider <asn@samba.org>
@@ -4761,7 +4761,7 @@ index 5983ebbd0a5..8fd9fcc5780 100644
From 60c9bdb31c4b558cb14a6861ecdb64a019c1a360 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Wed, 10 Jun 2020 12:48:18 +0200
-Subject: [PATCH 039/105] s3:utils: Remove obsolete force encryption from
+Subject: [PATCH 039/108] s3:utils: Remove obsolete force encryption from
mdfind
Signed-off-by: Andreas Schneider <asn@samba.org>
@@ -4795,7 +4795,7 @@ index 2ac4fde7daf..ef2657e4fa5 100644
From ad636063188db7e3307140edf7d5fdf40d79c0e4 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Wed, 10 Jun 2020 12:49:28 +0200
-Subject: [PATCH 040/105] s3:utils: Remove obsolete force encryption from
+Subject: [PATCH 040/108] s3:utils: Remove obsolete force encryption from
smbcquotas
Signed-off-by: Andreas Schneider <asn@samba.org>
@@ -4833,7 +4833,7 @@ index fea066ce468..4ceac7b3ab0 100644
From 4b64497f1473661d86b032f2ae82c2c845cf8c8d Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Wed, 10 Jun 2020 12:51:18 +0200
-Subject: [PATCH 041/105] s3:rpcclient: Remove obsolete force encryption from
+Subject: [PATCH 041/108] s3:rpcclient: Remove obsolete force encryption from
rpcclient
Signed-off-by: Andreas Schneider <asn@samba.org>
@@ -4871,7 +4871,7 @@ index 2ead6cc7ba5..575a42ebf70 100644
From 10c912597ca6a00e62e2756c8b6a83a35fbc2da5 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Mon, 6 Jul 2020 10:58:36 +0200
-Subject: [PATCH 042/105] examples: Remove obsolete force encryption from
+Subject: [PATCH 042/108] examples: Remove obsolete force encryption from
smb2mount
Signed-off-by: Andreas Schneider <asn@samba.org>
@@ -4909,7 +4909,7 @@ index 6206c3a9701..c64be573462 100644
From acc244f893ee415fc572c701af6c9894acbefa93 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Mon, 6 Jul 2020 11:05:59 +0200
-Subject: [PATCH 043/105] s3:libsmb: Make cli_cm_force_encryption_creds()
+Subject: [PATCH 043/108] s3:libsmb: Make cli_cm_force_encryption_creds()
static
Signed-off-by: Andreas Schneider <asn@samba.org>
@@ -4957,7 +4957,7 @@ index 850cf12c8a6..eeabcaa7463 100644
From 3c37b922596ec55b67942b901dd57abeb30197e8 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Thu, 13 Aug 2020 16:16:55 +0200
-Subject: [PATCH 044/105] s4:libcli: Return NTSTATUS errors for
+Subject: [PATCH 044/108] s4:libcli: Return NTSTATUS errors for
smb_composite_connect_send()
Signed-off-by: Andreas Schneider <asn@samba.org>
@@ -5057,7 +5057,7 @@ index 582d43ef173..ad50ae0ac81 100644
From 5b37563928d8f82d90359aeb62b89203895bb480 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Tue, 7 Jul 2020 12:54:26 +0200
-Subject: [PATCH 045/105] s4:libcli: Return if encryption is requested for SMB1
+Subject: [PATCH 045/108] s4:libcli: Return if encryption is requested for SMB1
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
@@ -5094,7 +5094,7 @@ index 6ee4929e8d7..51e121bdce6 100644
From 2d46ced85e374a823ecafde16743456eede6ce9e Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Tue, 7 Jul 2020 12:29:39 +0200
-Subject: [PATCH 046/105] s3:libcli: Split out smb2_connect_tcon_start()
+Subject: [PATCH 046/108] s3:libcli: Split out smb2_connect_tcon_start()
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
@@ -5147,7 +5147,7 @@ index 6fc3993a4e8..95ff05eac8f 100644
From 5ee85438a34c78b1ec626002192a7118fb01fdb7 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Tue, 7 Jul 2020 12:44:26 +0200
-Subject: [PATCH 047/105] s4:libcli: Add smb2_connect_enc_start()
+Subject: [PATCH 047/108] s4:libcli: Add smb2_connect_enc_start()
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
@@ -5218,7 +5218,7 @@ index 95ff05eac8f..3a3ecdf20e8 100644
From 7620d79d4aef09bf893ef1823cb3c8a12bdd6977 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Fri, 24 Jul 2020 10:18:52 +0200
-Subject: [PATCH 048/105] s4:libcli: Require signing for SMB encryption
+Subject: [PATCH 048/108] s4:libcli: Require signing for SMB encryption
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
@@ -5274,7 +5274,7 @@ index 3a3ecdf20e8..9540704491e 100644
From 28403a2791fda77fe9fb73202964a3cea1eb732c Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Tue, 7 Jul 2020 14:27:07 +0200
-Subject: [PATCH 049/105] python:tests: Add test for SMB encrypted DCERPC
+Subject: [PATCH 049/108] python:tests: Add test for SMB encrypted DCERPC
connection
Signed-off-by: Andreas Schneider <asn@samba.org>
@@ -5395,7 +5395,7 @@ index 20981754db4..adcb5b53189 100644
From 77523b06608555f58f31267a95ae54fd8bc3f495 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 4 Sep 2020 10:47:54 +0200
-Subject: [PATCH 050/105] auth:gensec: Add gensec_security_sasl_names()
+Subject: [PATCH 050/108] auth:gensec: Add gensec_security_sasl_names()
Pair-Programmed-With: Andreas Schneider <asn@samba.org>
@@ -5525,7 +5525,7 @@ index d2d62d6652e..4eb45643714 100644
From 84fb67e29e2e220b6e74067cab4ee986c53d6a0e Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 4 Sep 2020 10:48:27 +0200
-Subject: [PATCH 051/105] s4:ldap_server: Use samba_server_gensec_start() in
+Subject: [PATCH 051/108] s4:ldap_server: Use samba_server_gensec_start() in
ldapsrv_backend_Init()
Signed-off-by: Stefan Metzmacher <metze@samba.org>
@@ -5637,7 +5637,7 @@ index 2839082daef..915d9b94f9b 100644
From 79d9d8b597afc5f637039b29dd13a363c8cb9b54 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 4 Sep 2020 14:39:15 +0200
-Subject: [PATCH 052/105] auth:gensec: Make gensec_use_kerberos_mechs() a
+Subject: [PATCH 052/108] auth:gensec: Make gensec_use_kerberos_mechs() a
static function
Signed-off-by: Stefan Metzmacher <metze@samba.org>
@@ -5687,7 +5687,7 @@ index 4eb45643714..ebcab76999a 100644
From 434d9895989832e7f338c565c43ff2f7fa9c514e Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 4 Sep 2020 14:41:43 +0200
-Subject: [PATCH 053/105] auth:gensec: Pass use_kerberos and keep_schannel to
+Subject: [PATCH 053/108] auth:gensec: Pass use_kerberos and keep_schannel to
gensec_use_kerberos_mechs()
Signed-off-by: Stefan Metzmacher <metze@samba.org>
@@ -5761,7 +5761,7 @@ index ebcab76999a..8d1b41fec74 100644
From 0da017218009cce876c3e251beec5ea6958717f4 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 4 Sep 2020 17:00:45 +0200
-Subject: [PATCH 054/105] auth:gensec: If Kerberos is required, keep schannel
+Subject: [PATCH 054/108] auth:gensec: If Kerberos is required, keep schannel
for machine account auth
Signed-off-by: Stefan Metzmacher <metze@samba.org>
@@ -5798,7 +5798,7 @@ index 8d1b41fec74..3f42d611140 100644
From 9242884180b1f6bb202f7c5249f8d37a2453141e Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Fri, 4 Sep 2020 12:21:21 +0200
-Subject: [PATCH 055/105] auth:creds: Add cli_credentials_init_server()
+Subject: [PATCH 055/108] auth:creds: Add cli_credentials_init_server()
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
@@ -5864,7 +5864,7 @@ index 7d0cf53194b..438bcdce232 100644
From 2da8321de6ef2e81378bdb3221a7e9d398eebcc5 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Fri, 4 Sep 2020 12:21:36 +0200
-Subject: [PATCH 056/105] s4:rpc_server: Use cli_credentials_init_server()
+Subject: [PATCH 056/108] s4:rpc_server: Use cli_credentials_init_server()
Signed-off-by: Andreas Schneider <asn@samba.org>
(cherry picked from commit 6c94ebf77fdb7383be2042f5e20ba2ef598cd4a4)
@@ -5912,7 +5912,7 @@ index 084857a44bf..e64148ef788 100644
From 5a641937dc9b842a70754950f157ef8a559a49c8 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Mon, 7 Sep 2020 09:19:43 +0200
-Subject: [PATCH 057/105] s4:smb_server: Use cli_credentials_init_server() for
+Subject: [PATCH 057/108] s4:smb_server: Use cli_credentials_init_server() for
negprot
Signed-off-by: Andreas Schneider <asn@samba.org>
@@ -6012,7 +6012,7 @@ index 4aaaf46793b..c433eb194bd 100644
From 1f73660655160daa18acf5943dfd7cc323e801bd Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Tue, 8 Sep 2020 10:15:22 +0200
-Subject: [PATCH 058/105] selftest: Rename 'smb encrypt' to 'server smb
+Subject: [PATCH 058/108] selftest: Rename 'smb encrypt' to 'server smb
encrypt'
This makes it more clear what we want. 'smb encrypt' is a synonym for
@@ -6063,7 +6063,7 @@ index e141f102ef1..c070086ca49 100755
From a939facd076f75564d1a9e3c4afbb953a67bb6fe Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Tue, 8 Sep 2020 12:30:08 +0200
-Subject: [PATCH 059/105] selftest: Move enc_desired to provision to have it in
+Subject: [PATCH 059/108] selftest: Move enc_desired to provision to have it in
'fileserver' too
Signed-off-by: Andreas Schneider <asn@samba.org>
@@ -6110,7 +6110,7 @@ index c070086ca49..fa3ca8962a5 100755
From 297f6cd53a59a5f7e1bd8e57a791977de64e3f8c Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Tue, 8 Sep 2020 10:15:20 +0200
-Subject: [PATCH 060/105] s3:tests: Add smbclient tests for 'client smb
+Subject: [PATCH 060/108] s3:tests: Add smbclient tests for 'client smb
encrypt'
Signed-off-by: Andreas Schneider <asn@samba.org>
@@ -6251,7 +6251,7 @@ index 27dc7587b17..46bf274227c 100755
From 824907ed2e28b77897fef5d50dbc15b5b344c114 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Thu, 27 Aug 2020 15:19:27 +0200
-Subject: [PATCH 061/105] s3:client: Remove global smb_encrypt
+Subject: [PATCH 061/108] s3:client: Remove global smb_encrypt
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
@@ -6359,7 +6359,7 @@ index 56309efcea7..60d4fb3c5ee 100644
From 743cf3240680fd7b868dd789fd743ab9ecd66ace Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Thu, 27 Aug 2020 15:24:27 +0200
-Subject: [PATCH 062/105] s3:libsmb: Remove force_encrypt from cli_cm_open()
+Subject: [PATCH 062/108] s3:libsmb: Remove force_encrypt from cli_cm_open()
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
@@ -6513,7 +6513,7 @@ index eeabcaa7463..bb3e9e6874e 100644
From 5e0333d93ae6008c37b03deac682ca2d00030913 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Thu, 27 Aug 2020 15:26:39 +0200
-Subject: [PATCH 063/105] s3:libsmb: Remove force_encrypt from cli_cm_connect()
+Subject: [PATCH 063/108] s3:libsmb: Remove force_encrypt from cli_cm_connect()
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
@@ -6575,7 +6575,7 @@ index 4825b8f3fae..b0032005398 100644
From 7e74d7ac8b329aadb5c99a3852d19f4eadde533c Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Thu, 27 Aug 2020 15:28:28 +0200
-Subject: [PATCH 064/105] s3:libsmb: Remove force_encrypt from clidfs
+Subject: [PATCH 064/108] s3:libsmb: Remove force_encrypt from clidfs
do_connect()
Signed-off-by: Andreas Schneider <asn@samba.org>
@@ -6636,7 +6636,7 @@ index b0032005398..5503506de97 100644
From 487deacc65d64eff31211426be7865637bbff3cc Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Thu, 27 Aug 2020 15:52:11 +0200
-Subject: [PATCH 065/105] s3:libsmb: Remove force_encrypt from
+Subject: [PATCH 065/108] s3:libsmb: Remove force_encrypt from
cli_check_msdfs_proxy()
Signed-off-by: Andreas Schneider <asn@samba.org>
@@ -6733,7 +6733,7 @@ index bb3e9e6874e..f2b0a8c5ff8 100644
From feac38a965b280a8b9b4374597f57ae60db5e6bb Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Tue, 18 Aug 2020 17:15:09 +0200
-Subject: [PATCH 066/105] s3:libsmb: Pass cli_credentials to clidfs
+Subject: [PATCH 066/108] s3:libsmb: Pass cli_credentials to clidfs
do_connect()
Signed-off-by: Andreas Schneider <asn@samba.org>
@@ -6852,7 +6852,7 @@ index 736c565a7a8..d536e0597af 100644
From 46278f0a81f35add7bdb3276c64c9465586c0adf Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Tue, 18 Aug 2020 17:18:16 +0200
-Subject: [PATCH 067/105] s3:libsmb: Pass cli_credentials to cli_cm_connect()
+Subject: [PATCH 067/108] s3:libsmb: Pass cli_credentials to cli_cm_connect()
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
@@ -6923,7 +6923,7 @@ index d536e0597af..a2c6f5fe5ec 100644
From aa2e76ce788a224ea5b52550bf60103db7cf5d0d Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Tue, 18 Aug 2020 17:26:54 +0200
-Subject: [PATCH 068/105] s3:libsmb: Pass cli_credentials to cli_cm_open()
+Subject: [PATCH 068/108] s3:libsmb: Pass cli_credentials to cli_cm_open()
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
@@ -7134,7 +7134,7 @@ index f2b0a8c5ff8..0b8cf2a6036 100644
From c9a6141048f058168d2b1679c3a4bf087d367ee5 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Tue, 18 Aug 2020 17:42:25 +0200
-Subject: [PATCH 069/105] s3:libsmb: Pass cli_credentials to
+Subject: [PATCH 069/108] s3:libsmb: Pass cli_credentials to
cli_resolve_path(), using helper variables.
Signed-off-by: Andreas Schneider <asn@samba.org>
@@ -8021,7 +8021,7 @@ index 8fd9fcc5780..4989ec633c3 100644
From 915516d0e2f817a6e0169b6c2578c17cd8d9d1fc Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Thu, 27 Aug 2020 16:40:49 +0200
-Subject: [PATCH 070/105] s3:client: Remove global max_protocol
+Subject: [PATCH 070/108] s3:client: Remove global max_protocol
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
@@ -8103,7 +8103,7 @@ index 13e48f80a01..902cdec8b64 100644
From ac116f4a319a28453416fa30e66d8aa9a608ecc9 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Thu, 27 Aug 2020 16:43:46 +0200
-Subject: [PATCH 071/105] s3:libsmb: Remove max_protocol from cli_cm_open()
+Subject: [PATCH 071/108] s3:libsmb: Remove max_protocol from cli_cm_open()
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
@@ -8228,7 +8228,7 @@ index 517738dbcd7..8aaaff2cb1e 100644
From 70e2b7c9bd556f5d8762e86960864f71be357d60 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Thu, 27 Aug 2020 16:45:12 +0200
-Subject: [PATCH 072/105] s3:libcmb: Remove max_protocol from cli_cm_connect()
+Subject: [PATCH 072/108] s3:libcmb: Remove max_protocol from cli_cm_connect()
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
@@ -8281,7 +8281,7 @@ index fb1a0c72e6d..023dd4d2757 100644
From 68bb1153c9b2f3566f7558adb144f99d0dbbae64 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Thu, 27 Aug 2020 16:46:29 +0200
-Subject: [PATCH 073/105] s3:libsmb: Remove max_protocol from clidfs
+Subject: [PATCH 073/108] s3:libsmb: Remove max_protocol from clidfs
do_connect()
The if check for max_protocol == 0 is part of lp_client_max_protocol().
@@ -8344,7 +8344,7 @@ index 023dd4d2757..ee5becf76a6 100644
From e11dbff10f7e05de3e0886bb89f97d80f421a7cf Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Mon, 10 Aug 2020 15:47:35 +0200
-Subject: [PATCH 074/105] s3:include: Move loadparm prototypes to own header
+Subject: [PATCH 074/108] s3:include: Move loadparm prototypes to own header
file
Signed-off-by: Andreas Schneider <asn@samba.org>
@@ -8762,7 +8762,7 @@ index 00000000000..7686877ccf1
From aac95c28508e0afbd252579e8bdac8d24f3e5de0 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Tue, 11 Aug 2020 10:41:07 +0200
-Subject: [PATCH 075/105] s3:lib: Move interface prototypes to own header file
+Subject: [PATCH 075/108] s3:lib: Move interface prototypes to own header file
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
@@ -8868,7 +8868,7 @@ index 00000000000..f45435b4a81
From 8b9b3b04734a2caaf45cf4a4106e20489937dd63 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Fri, 7 Feb 2020 16:48:16 +0100
-Subject: [PATCH 076/105] idl: Add SID_SAMBA_SMB3
+Subject: [PATCH 076/108] idl: Add SID_SAMBA_SMB3
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
@@ -8898,7 +8898,7 @@ index a92e8f1518e..06bf7449a70 100644
From ea7d7d025cb198d787d219d169e0cf01f8ecb8be Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Fri, 7 Feb 2020 16:48:29 +0100
-Subject: [PATCH 077/105] s3:smbd: Add SMB3 connection information to session
+Subject: [PATCH 077/108] s3:smbd: Add SMB3 connection information to session
info
Signed-off-by: Andreas Schneider <asn@samba.org>
@@ -9055,7 +9055,7 @@ index cf9de185c1f..cd24b7d2ed5 100644
From fd5b1158697117be089d7feb199076a5413239c6 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Thu, 12 Mar 2020 14:11:56 +0100
-Subject: [PATCH 078/105] librpc: Add dcerpc helper
+Subject: [PATCH 078/108] librpc: Add dcerpc helper
dcerpc_is_transport_encrypted()
Signed-off-by: Andreas Schneider <asn@samba.org>
@@ -9271,7 +9271,7 @@ index 27b180fa63d..109a1834841 100644
From 671201a82e2590951f9ac7ff92a17662971bf1c6 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Fri, 28 Aug 2020 16:31:17 +0200
-Subject: [PATCH 079/105] s3:smbd: Use defines to set 'srv_smb_encrypt'
+Subject: [PATCH 079/108] s3:smbd: Use defines to set 'srv_smb_encrypt'
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
@@ -9308,7 +9308,7 @@ index d51a3de9497..785cbb23b5f 100644
From 5d542e9aef4c97cf5747d6580971c64fc81d4853 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Tue, 12 Nov 2019 16:56:45 +0100
-Subject: [PATCH 080/105] s3:rpc_server: Allow to use RC4 for setting passwords
+Subject: [PATCH 080/108] s3:rpc_server: Allow to use RC4 for setting passwords
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
@@ -9545,7 +9545,7 @@ index 2af02ad6fa8..eb91ac09384 100644
From bd94d3d3a4919616b40cd7306374bee5f244bb71 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Fri, 15 Nov 2019 13:49:40 +0100
-Subject: [PATCH 081/105] s4:rpc_server: Allow to use RC4 for setting passwords
+Subject: [PATCH 081/108] s4:rpc_server: Allow to use RC4 for setting passwords
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
@@ -9676,7 +9676,7 @@ index de55ad6239a..c9c1978f223 100644
From d458644e8800fbb312749ac6e496c0b89429d229 Mon Sep 17 00:00:00 2001
From: Isaac Boukris <iboukris@gmail.com>
Date: Thu, 20 Aug 2020 12:45:49 +0200
-Subject: [PATCH 082/105] lib:crypto: Add py binding for set_relax/strict fips
+Subject: [PATCH 082/108] lib:crypto: Add py binding for set_relax/strict fips
mode
Signed-off-by: Isaac Boukris <iboukris@gmail.com>
@@ -9734,7 +9734,7 @@ index 32b946eee8f..ad18d3ada0f 100644
From 5f742a16dc55bd76443e7b6f5a6910604102c41b Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Wed, 28 Oct 2020 17:05:36 +0100
-Subject: [PATCH 083/105] s4:param: Add 'weak crypto' getter to pyparam
+Subject: [PATCH 083/108] s4:param: Add 'weak crypto' getter to pyparam
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
@@ -9790,7 +9790,7 @@ index 4023fac4dd6..e15592b5743 100644
From 0851add217d1c5f3c5038fa68b2704fc7f3a073f Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Wed, 21 Oct 2020 10:09:22 +0200
-Subject: [PATCH 084/105] python:tests: Add SAMR password change tests for fips
+Subject: [PATCH 084/108] python:tests: Add SAMR password change tests for fips
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
@@ -10015,7 +10015,7 @@ index adcb5b53189..86cab3f8046 100644
From d9d570cd7dcd4d8a4fef6b098e7163d6dfe0a85b Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Wed, 21 Oct 2020 10:09:22 +0200
-Subject: [PATCH 085/105] python:tests: Add SAMR password change tests for fips
+Subject: [PATCH 085/108] python:tests: Add SAMR password change tests for fips
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
@@ -10048,7 +10048,7 @@ index 649e923ff9a..1ebdf2a5484 100755
From f23b2e38a9169b074ca12a24cc91a12bfc582ad9 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Thu, 20 Aug 2020 09:40:41 +0200
-Subject: [PATCH 086/105] auth:creds: Rename CRED_USE_KERBEROS values
+Subject: [PATCH 086/108] auth:creds: Rename CRED_USE_KERBEROS values
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
@@ -10790,7 +10790,7 @@ index 07c6faebb15..701dfc10a07 100644
From 7f21cee87046f219f0b3cc9874e816f8b7812278 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Tue, 1 Sep 2020 12:32:28 +0200
-Subject: [PATCH 087/105] auth:creds:tests: Migrate test to a cmocka unit test
+Subject: [PATCH 087/108] auth:creds:tests: Migrate test to a cmocka unit test
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
@@ -11087,7 +11087,7 @@ index 38b6c8f4b6e..f0ab0357986 100644
From 286d1baff05b7c1a899ad9d73a41ed4d5b69e0d5 Mon Sep 17 00:00:00 2001
From: Isaac Boukris <iboukris@gmail.com>
Date: Thu, 20 Aug 2020 12:09:05 +0200
-Subject: [PATCH 088/105] Add smb2cli_session_get_encryption_cipher()
+Subject: [PATCH 088/108] Add smb2cli_session_get_encryption_cipher()
When 'session->smb2->should_encrypt' is true, the client MUST encrypt
all transport messages (see also MS-SMB2 3.2.4.1.8).
@@ -11144,7 +11144,7 @@ index 2afc7165cd9..db5f5d58799 100644
From 34242b72abc65a100f6d19e98369b926ffdd17b9 Mon Sep 17 00:00:00 2001
From: Isaac Boukris <iboukris@gmail.com>
Date: Thu, 20 Aug 2020 12:18:21 +0200
-Subject: [PATCH 089/105] Add dcerpc_transport_encrypted()
+Subject: [PATCH 089/108] Add dcerpc_transport_encrypted()
Signed-off-by: Isaac Boukris <iboukris@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
@@ -11236,7 +11236,7 @@ index bd79a072bc8..6ea27a8d9a3 100644
From 3aea4bbd34849aedca16a4a6baf0bdf914ddde81 Mon Sep 17 00:00:00 2001
From: Isaac Boukris <iboukris@gmail.com>
Date: Thu, 20 Aug 2020 12:35:01 +0200
-Subject: [PATCH 090/105] Add py binding for dcerpc_transport_encrypted
+Subject: [PATCH 090/108] Add py binding for dcerpc_transport_encrypted
Signed-off-by: Isaac Boukris <iboukris@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
@@ -11283,7 +11283,7 @@ index be914ed5f14..309a6d72e26 100644
From 0f6af3877dd1f84f2813e491fa3508f5378400cd Mon Sep 17 00:00:00 2001
From: Isaac Boukris <iboukris@gmail.com>
Date: Thu, 20 Aug 2020 12:44:08 +0200
-Subject: [PATCH 091/105] selftest: add a test for py dce transport_encrypted
+Subject: [PATCH 091/108] selftest: add a test for py dce transport_encrypted
Signed-off-by: Isaac Boukris <iboukris@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
@@ -11348,7 +11348,7 @@ index 8e0d6a5ef0a..24e4ac77d89 100644
From 204dbcb972e85497960fffa68b8309f7d28b1c00 Mon Sep 17 00:00:00 2001
From: Isaac Boukris <iboukris@gmail.com>
Date: Thu, 20 Aug 2020 12:47:12 +0200
-Subject: [PATCH 092/105] Add CreateTrustedDomainRelax wrapper for fips mode
+Subject: [PATCH 092/108] Add CreateTrustedDomainRelax wrapper for fips mode
Signed-off-by: Isaac Boukris <iboukris@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
@@ -11434,7 +11434,7 @@ index 00000000000..b4df0fa5bb8
From 7240d19414330b3cebc0b9633b60b3e07a41110a Mon Sep 17 00:00:00 2001
From: Isaac Boukris <iboukris@gmail.com>
Date: Thu, 20 Aug 2020 12:49:17 +0200
-Subject: [PATCH 093/105] Use the new CreateTrustedDomainRelax()
+Subject: [PATCH 093/108] Use the new CreateTrustedDomainRelax()
Signed-off-by: Isaac Boukris <iboukris@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
@@ -11541,7 +11541,7 @@ index 1d12c362911..93a3258d28d 100644
From 6d8e8f07766fd6b43baff3b9495b927b28c142e6 Mon Sep 17 00:00:00 2001
From: Isaac Boukris <iboukris@gmail.com>
Date: Tue, 1 Sep 2020 20:14:29 +0300
-Subject: [PATCH 094/105] selftest: add a test for the CreateTrustedDomainRelax
+Subject: [PATCH 094/108] selftest: add a test for the CreateTrustedDomainRelax
wrapper
Originally copied from 'source4/scripting/devel/createtrust'
@@ -11726,7 +11726,7 @@ index 3a903a7eee0..96f51b68cfc 100755
From e4290d0a47d020a726051e67d18f6a5378001bb3 Mon Sep 17 00:00:00 2001
From: Isaac Boukris <iboukris@gmail.com>
Date: Thu, 5 Nov 2020 15:38:19 +0200
-Subject: [PATCH 095/105] Remove source4/scripting/devel/createtrust script
+Subject: [PATCH 095/108] Remove source4/scripting/devel/createtrust script
We now have the 'samba-tool domain trust' command.
@@ -11881,7 +11881,7 @@ index 26b0d0dcb68..00000000000
From 840be1b927ac2600f548d9c1e504f77de6c84f96 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Fri, 6 Nov 2020 14:30:26 +0100
-Subject: [PATCH 096/105] s3:rpc_server: Use gnutls_cipher_decrypt() in
+Subject: [PATCH 096/108] s3:rpc_server: Use gnutls_cipher_decrypt() in
get_trustdom_auth_blob()
It doesn't matter for RC4, but just to be correct.
@@ -11913,7 +11913,7 @@ index 198387424e6..e749caf2551 100644
From e7b7b3f4aec8fb6d37375934f0f193fea6649f18 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Fri, 6 Nov 2020 14:33:38 +0100
-Subject: [PATCH 097/105] s4:rpc_server: Use gnutls_cipher_decrypt() in
+Subject: [PATCH 097/108] s4:rpc_server: Use gnutls_cipher_decrypt() in
get_trustdom_auth_blob()
It doesn't matter for RC4, but just to be correct.
@@ -11945,7 +11945,7 @@ index 8333cb149b6..4bb8aaa9592 100644
From 3c57cdaa7013bc01ac6b3d65dade151526cacc5b Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Thu, 20 Aug 2020 13:40:21 +0200
-Subject: [PATCH 098/105] s3:rpc_server: Allow to use RC4 for creating trusts
+Subject: [PATCH 098/108] s3:rpc_server: Allow to use RC4 for creating trusts
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
@@ -12012,7 +12012,7 @@ index e749caf2551..d6d606ddeca 100644
From 2f22b25cb718c70383ed3ba8ebd91d9f317c455e Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Thu, 20 Aug 2020 13:51:39 +0200
-Subject: [PATCH 099/105] s4:rpc_server: Allow to use RC4 for creating trusts
+Subject: [PATCH 099/108] s4:rpc_server: Allow to use RC4 for creating trusts
Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Alexander Bokovoy <ab@samba.org>
@@ -12084,7 +12084,7 @@ index 4bb8aaa9592..5b3ef71d458 100644
From 32a6dbc4bca9f104d7d88eaea2afce20416256d1 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Fri, 6 Nov 2020 10:13:48 +0100
-Subject: [PATCH 100/105] sefltest: Enable the dcerpc.createtrustrelax test
+Subject: [PATCH 100/108] sefltest: Enable the dcerpc.createtrustrelax test
against ad_dc_fips
Signed-off-by: Andreas Schneider <asn@samba.org>
@@ -12114,7 +12114,7 @@ index 80effda8343..00000000000
From ce72237a2ac40da4b78afbcceab13d5e58e4fe5e Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Wed, 11 Nov 2020 13:42:06 +0100
-Subject: [PATCH 101/105] s3:smbd: Fix possible null pointer dereference in
+Subject: [PATCH 101/108] s3:smbd: Fix possible null pointer dereference in
token_contains_name()
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14572
@@ -12150,7 +12150,7 @@ index 57754a0f766..694c0c290e8 100644
From 08cd57786058ba735931a166c13375ce8a02e0e9 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <ab@samba.org>
Date: Tue, 10 Nov 2020 17:35:24 +0200
-Subject: [PATCH 102/105] lookup_name: allow lookup names prefixed with DNS
+Subject: [PATCH 102/108] lookup_name: allow lookup names prefixed with DNS
forest root for FreeIPA DC
In FreeIPA deployment with active Global Catalog service, when a two-way
@@ -12260,7 +12260,7 @@ index 82c47b3145b..864246da56e 100644
From 0f694e82b7504bc902b08cfa1575099963cccd51 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <ab@samba.org>
Date: Wed, 11 Nov 2020 14:42:55 +0200
-Subject: [PATCH 103/105] auth_sam: use pdb_get_domain_info to look up DNS
+Subject: [PATCH 103/108] auth_sam: use pdb_get_domain_info to look up DNS
forest information
When Samba is used as a part of FreeIPA domain controller, Windows
@@ -12483,7 +12483,7 @@ index 3c12f959faf..e8e0d543f8c 100644
From d1de17ecd572d827f38042d7a17536900b55b889 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Fri, 27 Nov 2020 11:22:15 +0100
-Subject: [PATCH 104/105] docs-xml: Add a section about weak crypto in testparm
+Subject: [PATCH 104/108] docs-xml: Add a section about weak crypto in testparm
manpage
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14583
@@ -12526,7 +12526,7 @@ index 9099cda010f..7c7abf50e8b 100644
From 87bdffab6eae644d468f0fdc4489667fc21ac3a6 Mon Sep 17 00:00:00 2001
From: Isaac Boukris <iboukris@gmail.com>
Date: Tue, 15 Dec 2020 15:17:04 +0100
-Subject: [PATCH 105/105] HACK:s3:winbind: Rely on the domain child for online
+Subject: [PATCH 105/108] HACK:s3:winbind: Rely on the domain child for online
check
---
@@ -12585,3 +12585,334 @@ index 47efe988d65..d2006c95f54 100644
--
2.29.2
+
+From 6e724a5e7055e1b18e0c7e1a2ceb81729941dc2c Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@samba.org>
+Date: Wed, 3 Feb 2021 10:30:08 +0100
+Subject: [PATCH 106/108] lib:util: Add basic memcache unit test
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=14625
+
+Signed-off-by: Andreas Schneider <asn@samba.org>
+Reviewed-by: Ralph Boehme <slow@samba.org>
+(cherry picked from commit bebbf621d6052f797c5cf19a2a9bbc13e699d3f0)
+---
+ lib/util/tests/test_memcache.c | 122 +++++++++++++++++++++++++++++++++
+ lib/util/wscript_build | 8 ++-
+ selftest/tests.py | 2 +
+ 3 files changed, 131 insertions(+), 1 deletion(-)
+ create mode 100644 lib/util/tests/test_memcache.c
+
+diff --git a/lib/util/tests/test_memcache.c b/lib/util/tests/test_memcache.c
+new file mode 100644
+index 00000000000..8ea5e5b042e
+--- /dev/null
++++ b/lib/util/tests/test_memcache.c
+@@ -0,0 +1,122 @@
++/*
++ * Unix SMB/CIFS implementation.
++ *
++ * Copyright (C) 2021 Andreas Schneider <asn@samba.org>
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU General Public License as published by
++ * the Free Software Foundation; either version 3 of the License, or
++ * (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program. If not, see <http://www.gnu.org/licenses/>.
++ */
++
++#include <stdarg.h>
++#include <stddef.h>
++#include <stdint.h>
++#include <setjmp.h>
++#include <cmocka.h>
++
++#include "lib/replace/replace.h"
++#include "lib/util/talloc_stack.h"
++#include "lib/util/memcache.h"
++
++static int setup_talloc_context(void **state)
++{
++ TALLOC_CTX *frame = talloc_stackframe();
++
++ *state = frame;
++ return 0;
++}
++
++static int teardown_talloc_context(void **state)
++{
++ TALLOC_CTX *frame = *state;
++ TALLOC_FREE(frame);
++ return 0;
++}
++
++static void torture_memcache_init(void **state)
++{
++ TALLOC_CTX *mem_ctx = *state;
++ struct memcache *cache = NULL;
++
++ cache = memcache_init(mem_ctx, 0);
++ assert_non_null(cache);
++
++ TALLOC_FREE(cache);
++
++ cache = memcache_init(mem_ctx, 10);
++ assert_non_null(cache);
++
++ TALLOC_FREE(cache);
++}
++
++static void torture_memcache_add_lookup_delete(void **state)
++{
++ TALLOC_CTX *mem_ctx = *state;
++ struct memcache *cache = NULL;
++ DATA_BLOB key1, key2;
++ char *path1 = NULL, *path2 = NULL;
++
++ cache = memcache_init(mem_ctx, 0);
++ assert_non_null(cache);
++
++ key1 = data_blob_const("key1", 4);
++ path1 = talloc_strdup(mem_ctx, "/tmp/one");
++ assert_non_null(path1);
++
++ key2 = data_blob_const("key2", 4);
++ path2 = talloc_strdup(mem_ctx, "/tmp/two");
++ assert_non_null(path1);
++
++ memcache_add_talloc(cache, GETWD_CACHE, key1, &path1);
++ assert_null(path1);
++
++ memcache_add_talloc(cache, GETWD_CACHE, key2, &path2);
++ assert_null(path2);
++
++ path1 = memcache_lookup_talloc(cache, GETWD_CACHE, key1);
++ assert_non_null(path1);
++ assert_string_equal(path1, "/tmp/one");
++
++ path2 = memcache_lookup_talloc(cache, GETWD_CACHE, key2);
++ assert_non_null(path2);
++ assert_string_equal(path2, "/tmp/two");
++
++ memcache_delete(cache, GETWD_CACHE, key1);
++ path1 = memcache_lookup_talloc(cache, GETWD_CACHE, key1);
++ assert_null(path1);
++
++ memcache_flush(cache, GETWD_CACHE);
++ path2 = memcache_lookup_talloc(cache, GETWD_CACHE, key2);
++ assert_null(path2);
++
++ TALLOC_FREE(cache);
++}
++
++int main(int argc, char *argv[])
++{
++ int rc;
++ const struct CMUnitTest tests[] = {
++ cmocka_unit_test(torture_memcache_init),
++ cmocka_unit_test(torture_memcache_add_lookup_delete),
++ };
++
++ if (argc == 2) {
++ cmocka_set_test_filter(argv[1]);
++ }
++ cmocka_set_message_output(CM_OUTPUT_SUBUNIT);
++
++ rc = cmocka_run_group_tests(tests,
++ setup_talloc_context,
++ teardown_talloc_context);
++
++ return rc;
++}
+diff --git a/lib/util/wscript_build b/lib/util/wscript_build
+index bf3e44bf1d2..5a8a04965ec 100644
+--- a/lib/util/wscript_build
++++ b/lib/util/wscript_build
+@@ -310,4 +310,10 @@ else:
+ source='tests/test_util.c',
+ deps='cmocka replace talloc samba-util',
+ local_include=False,
+- for_selftest=True);
++ for_selftest=True)
++
++ bld.SAMBA_BINARY('test_memcache',
++ source='tests/test_memcache.c',
++ deps='cmocka replace talloc samba-util',
++ local_include=False,
++ for_selftest=True)
+diff --git a/selftest/tests.py b/selftest/tests.py
+index 4a968cdbe8a..003698a5eb3 100644
+--- a/selftest/tests.py
++++ b/selftest/tests.py
+@@ -403,6 +403,8 @@ plantestsuite("samba.unittests.util_paths", "none",
+ [os.path.join(bindir(), "default/lib/util/test_util_paths")])
+ plantestsuite("samba.unittests.util", "none",
+ [os.path.join(bindir(), "default/lib/util/test_util")])
++plantestsuite("samba.unittests.memcache", "none",
++ [os.path.join(bindir(), "default/lib/util/test_memcache")])
+ plantestsuite("samba.unittests.ntlm_check", "none",
+ [os.path.join(bindir(), "default/libcli/auth/test_ntlm_check")])
+ plantestsuite("samba.unittests.gnutls", "none",
+--
+2.29.2
+
+
+From 0f568ce9a376a7743372c502d0afd224e9b2649d Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@samba.org>
+Date: Wed, 3 Feb 2021 10:37:12 +0100
+Subject: [PATCH 107/108] lib:util: Add cache oversize test for memcache
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=14625
+
+Signed-off-by: Andreas Schneider <asn@samba.org>
+Reviewed-by: Ralph Boehme <slow@samba.org>
+(cherry picked from commit 00543ab3b29e3fbfe8314e51919629803e14ede6)
+---
+ lib/util/tests/test_memcache.c | 39 ++++++++++++++++++++++++++++++++++
+ selftest/knownfail.d/memcache | 1 +
+ 2 files changed, 40 insertions(+)
+ create mode 100644 selftest/knownfail.d/memcache
+
+diff --git a/lib/util/tests/test_memcache.c b/lib/util/tests/test_memcache.c
+index 8ea5e5b042e..8a3997817c1 100644
+--- a/lib/util/tests/test_memcache.c
++++ b/lib/util/tests/test_memcache.c
+@@ -98,6 +98,44 @@ static void torture_memcache_add_lookup_delete(void **state)
+ path2 = memcache_lookup_talloc(cache, GETWD_CACHE, key2);
+ assert_null(path2);
+
++ TALLOC_FREE(path1);
++ TALLOC_FREE(path2);
++ TALLOC_FREE(cache);
++}
++
++static void torture_memcache_add_oversize(void **state)
++{
++ TALLOC_CTX *mem_ctx = *state;
++ struct memcache *cache = NULL;
++ DATA_BLOB key1, key2;
++ char *path1 = NULL, *path2 = NULL;
++
++ cache = memcache_init(mem_ctx, 10);
++ assert_non_null(cache);
++
++ key1 = data_blob_const("key1", 4);
++ path1 = talloc_strdup(mem_ctx, "/tmp/one");
++ assert_non_null(path1);
++
++ key2 = data_blob_const("key2", 4);
++ path2 = talloc_strdup(mem_ctx, "/tmp/two");
++ assert_non_null(path1);
++
++ memcache_add_talloc(cache, GETWD_CACHE, key1, &path1);
++ assert_null(path1);
++
++ memcache_add_talloc(cache, GETWD_CACHE, key2, &path2);
++ assert_null(path2);
++
++ path1 = memcache_lookup_talloc(cache, GETWD_CACHE, key1);
++ assert_null(path1);
++
++ path2 = memcache_lookup_talloc(cache, GETWD_CACHE, key2);
++ assert_non_null(path2);
++ assert_string_equal(path2, "/tmp/two");
++
++ TALLOC_FREE(path1);
++ TALLOC_FREE(path2);
+ TALLOC_FREE(cache);
+ }
+
+@@ -107,6 +145,7 @@ int main(int argc, char *argv[])
+ const struct CMUnitTest tests[] = {
+ cmocka_unit_test(torture_memcache_init),
+ cmocka_unit_test(torture_memcache_add_lookup_delete),
++ cmocka_unit_test(torture_memcache_add_oversize),
+ };
+
+ if (argc == 2) {
+diff --git a/selftest/knownfail.d/memcache b/selftest/knownfail.d/memcache
+new file mode 100644
+index 00000000000..0a74ace3003
+--- /dev/null
++++ b/selftest/knownfail.d/memcache
+@@ -0,0 +1 @@
++^samba.unittests.memcache.torture_memcache_add_oversize
+--
+2.29.2
+
+
+From e8698352f3033ca1ce0dcdfe2049bae0bafe0dab Mon Sep 17 00:00:00 2001
+From: Andreas Schneider <asn@samba.org>
+Date: Tue, 2 Feb 2021 18:10:38 +0100
+Subject: [PATCH 108/108] lib:util: Avoid free'ing our own pointer
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=14625
+
+Signed-off-by: Andreas Schneider <asn@samba.org>
+Reviewed-by: Ralph Boehme <slow@samba.org>
+(cherry picked from commit 0bdbe50fac680be3fe21043246b8c75005611351)
+---
+ lib/util/memcache.c | 19 +++++++++++++++----
+ selftest/knownfail.d/memcache | 1 -
+ 2 files changed, 15 insertions(+), 5 deletions(-)
+ delete mode 100644 selftest/knownfail.d/memcache
+
+diff --git a/lib/util/memcache.c b/lib/util/memcache.c
+index 1e616bd0e9a..7b0b27eaddb 100644
+--- a/lib/util/memcache.c
++++ b/lib/util/memcache.c
+@@ -223,14 +223,25 @@ static void memcache_delete_element(struct memcache *cache,
+ TALLOC_FREE(e);
+ }
+
+-static void memcache_trim(struct memcache *cache)
++static void memcache_trim(struct memcache *cache, struct memcache_element *e)
+ {
++ struct memcache_element *tail = NULL;
++
+ if (cache->max_size == 0) {
+ return;
+ }
+
+- while ((cache->size > cache->max_size) && DLIST_TAIL(cache->mru)) {
+- memcache_delete_element(cache, DLIST_TAIL(cache->mru));
++ for (tail = DLIST_TAIL(cache->mru);
++ (cache->size > cache->max_size) && (tail != NULL);
++ tail = DLIST_TAIL(cache->mru))
++ {
++ if (tail == e) {
++ tail = DLIST_PREV(tail);
++ if (tail == NULL) {
++ break;
++ }
++ }
++ memcache_delete_element(cache, tail);
+ }
+ }
+
+@@ -351,7 +362,7 @@ void memcache_add(struct memcache *cache, enum memcache_number n,
+ memcpy(&mtv, cache_value.data, sizeof(mtv));
+ cache->size += mtv.len;
+ }
+- memcache_trim(cache);
++ memcache_trim(cache, e);
+ }
+
+ void memcache_add_talloc(struct memcache *cache, enum memcache_number n,
+diff --git a/selftest/knownfail.d/memcache b/selftest/knownfail.d/memcache
+deleted file mode 100644
+index 0a74ace3003..00000000000
+--- a/selftest/knownfail.d/memcache
++++ /dev/null
+@@ -1 +0,0 @@
+-^samba.unittests.memcache.torture_memcache_add_oversize
+--
+2.29.2
+
diff --git a/SPECS/samba.spec b/SPECS/samba.spec
index 0651771..668fd21 100644
--- a/SPECS/samba.spec
+++ b/SPECS/samba.spec
@@ -96,7 +96,7 @@
%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 main_release 2
+%global main_release 3
%global samba_version 4.13.3
%global talloc_version 2.3.1
@@ -183,6 +183,7 @@ Requires: %{name}-common-tools = %{samba_depver}
Requires: %{name}-client-libs = %{samba_depver}
Requires: %{name}-libs = %{samba_depver}
%if %{with libwbclient}
+Requires(post): libwbclient = %{samba_depver}
Requires: libwbclient = %{samba_depver}
%endif
@@ -421,6 +422,10 @@ Requires: %{name}-libs = %{samba_depver}
Requires: %{name}-dc-provision = %{samba_depver}
Requires: %{name}-dc-libs = %{samba_depver}
Requires: %{name}-winbind = %{samba_depver}
+%if %{with libwbclient}
+Requires(post): libwbclient = %{samba_depver}
+Requires: libwbclient = %{samba_depver}
+%endif
# samba-tool needs tdbbackup
Requires: tdb-tools
# samba-tool needs mdb_copy
@@ -726,7 +731,10 @@ Requires: %{name}-common-tools = %{samba_depver}
Requires: %{name}-client-libs = %{samba_depver}
Requires: %{name}-libs = %{samba_depver}
Requires: %{name}-winbind-modules = %{samba_depver}
+%if %{with libwbclient}
+Requires(post): libwbclient = %{samba_depver}
Requires: libwbclient = %{samba_depver}
+%endif
Provides: samba4-winbind = %{samba_depver}
Obsoletes: samba4-winbind < %{samba_depver}
@@ -3776,6 +3784,11 @@ fi
%endif
%changelog
+* Thu Feb 04 2021 Andreas Schneider <asn@redhat.com> - 4.13.3-3
+- resolves: #1924615 - Fix a memcache bug when cache is full
+- resolves: #1924571 - Ensure that libwbclient has been updated before
+ restarting services
+
* Fri Jan 29 2021 Andreas Schneider <asn@redhat.com> - 4.13.3-2
- resolves: #1909647 - Fix winbind in trust scenarios with connection issues