diff --git a/SOURCES/samba-4.13-redhat.patch b/SOURCES/samba-4.13-redhat.patch
index 295b6b6..c79d58b 100644
--- a/SOURCES/samba-4.13-redhat.patch
+++ b/SOURCES/samba-4.13-redhat.patch
@@ -1,7 +1,7 @@
From 77a771be72a6084216ea848f2d851eb7192ae9b9 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/106] libcli:smb2: Do not leak ptext on error
+Subject: [PATCH 001/107] 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 623fc23fb18..bba80817018 100644
From eb5fbbd3090cbdea95b14e9ac167253fafe633f8 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/106] libcli:smb2: Use talloc NULL context if we don't have
+Subject: [PATCH 002/107] 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 bba80817018..7669b219bbe 100644
From 66ee204aee9a4919d94003a9a3263a44c2d5b436 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/106] auth:creds: Introduce CRED_SMB_CONF
+Subject: [PATCH 003/107] 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 8d2d8cdc90d0455429c9d461ebd65d21a0b29b8d 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/106] param: Add 'server smb encrypt' parameter
+Subject: [PATCH 004/107] 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 71b97ba1fd9260efd29e3ab3456b82d2a4f6dcc8 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/106] param: Create and use enum_smb_encryption_vals
+Subject: [PATCH 005/107] 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 ca1e10a901af67327d25765bfed404e2d1c756a5 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/106] s3:smbd: Use 'enum smb_encryption_setting' values
+Subject: [PATCH 006/107] 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 a5630bb933393fe69ff9b7f072221b9085d6277c 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/106] docs-xml: Add 'client smb encrypt'
+Subject: [PATCH 007/107] 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 b305e34b252..9a2a309b781 100644
From 3d826b1efb4a0e1f77875c7cbad2fcd16c3ac17b 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/106] lib:param: Add lpcfg_parse_enum_vals()
+Subject: [PATCH 008/107] 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 2f74f9d6a5d38e6eb2ca3d32f61d5d9b1c55f3c1 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/106] libcli:smb: Add smb_signing_setting_translate()
+Subject: [PATCH 009/107] 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 912ec83bf4ec6a965ee10ace1d74036c5c6a4c92 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/106] libcli:smb: Add smb_encryption_setting_translate()
+Subject: [PATCH 010/107] 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 7d2c3a519805549f577b54cf72a5d95b4ae744f3 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/106] s3:lib: Use smb_signing_setting_translate for cmdline
+Subject: [PATCH 011/107] 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 d488762aa9468bd54890a2fe3dba3fd52582b556 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/106] auth:creds: Remove unused credentials autoproto
+Subject: [PATCH 012/107] auth:creds: Remove unused credentials autoproto
header
Signed-off-by: Andreas Schneider <asn@samba.org>
@@ -1708,7 +1708,7 @@ index 7711eac2afa..d9be3562adb 100644
From 696d2230503dada1e4369500c7c632bd7d3e5527 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/106] auth:creds: Add
+Subject: [PATCH 013/107] 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 0176a9d55aed4bdb49ac6f703dcae778b2f4ac5c 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/106] auth:creds: Add python bindings for
+Subject: [PATCH 014/107] 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 96c4ce197bb62772778d822f0e5956d5a3ffe28d 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/106] auth:creds: Add
+Subject: [PATCH 015/107] 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 301adf15736a4cb10f9dca267a906efb8f885354 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/106] auth:creds: Add python bindings for
+Subject: [PATCH 016/107] 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 cf2cafb38dd319c01ff539a73d40dac8813f03a0 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/106] auth:creds: Add
+Subject: [PATCH 017/107] 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 a25732f42cf7418789c2102f093dc0b3062543fd 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/106] auth:creds: Add python bindings for
+Subject: [PATCH 018/107] 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 1a1809bd260ceff97dd4ff697f78b97a63f60b48 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/106] auth:creds: Add python bindings for
+Subject: [PATCH 019/107] 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 72b31403174eb23fe4fdf75ad918e845a740db6f 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/106] auth:creds: Bump library version
+Subject: [PATCH 020/107] auth:creds: Bump library version
We added new functions so bump the version.
@@ -2623,7 +2623,7 @@ index 564a04fe8dd..1e3302e3e48 100644
From 918b87437b9c36981049ca4e3cf0220ad56ec7c2 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/106] s3:lib: Use cli_credential_(get|set)_smb_signing()
+Subject: [PATCH 021/107] 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 22efb02d818946e4f03ebfb72ea345e9106deca8 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/106] s3:lib: Set smb encryption also via cli creds API
+Subject: [PATCH 022/107] 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 9abae48706106793f8952524ad2325bdd6a5101c 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/106] python: Remove unused sign argument from
+Subject: [PATCH 023/107] 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 e2f0f56ea6ec4f9696affdee08de89c0bdffa719 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/106] python: Set smb signing via the creds API
+Subject: [PATCH 024/107] 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 53b2d53349b8f453cd0144f01b833deca52e3626 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/106] s3:libsmb: Introduce CLI_FULL_CONNECTION_IPC
+Subject: [PATCH 025/107] 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 975383e368a3891e92fb071ab20f2b5208167500 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/106] s3:pylibsmb: Add ipc=True support for
+Subject: [PATCH 026/107] 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 59831141a17195b9308d75257123134b0217489c 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/106] python:tests: Mark libsmb connection as an IPC
+Subject: [PATCH 027/107] 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 b9df53c20a753bf31b8684776f2b6aaaf1583abe 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/106] python:tests: Set smb ipc signing via the creds API
+Subject: [PATCH 028/107] 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 c9e88d833db2b472099e5751b7731e337342d2c4 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/106] s3:libsmb: Use 'enum smb_signing_setting' in
+Subject: [PATCH 029/107] 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 40c201c4d1b4621e823485e3082d0ca5799a6237 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/106] s3:client: Turn off smb signing for message op
+Subject: [PATCH 030/107] 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 639de1d5ddf200d03f51b0436789f5dde4cd083b 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/106] s3:libsmb: Remove signing_state from
+Subject: [PATCH 031/107] 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 57336e07f2e23dade5fcd0b8f0d002202cda223d 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/106] s3:libsmb: Remove signing_state from
+Subject: [PATCH 032/107] 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 6752c123f20d46aa68725971e09548a47b7c7457 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/106] s3:libsmb: Add encryption support to
+Subject: [PATCH 033/107] 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 bdb894ebb29820b97dba3721a517a61d96fac152 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/106] python: Add a test for SMB encryption
+Subject: [PATCH 034/107] 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 d26afd8352435db71c542388220e951184adcdde 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/106] s3:net: Use cli_credentials_set_smb_encryption()
+Subject: [PATCH 035/107] 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 c228933e88c6b615fa49402d2e826a5ec14b9f85 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/106] s3:libsmb: Use cli_credentials_set_smb_encryption()
+Subject: [PATCH 036/107] 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 76dc706e6449161c27a5f117bc45922ab467dbfc 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/106] s3:client: Remove unused smb encryption code
+Subject: [PATCH 037/107] 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 a444688a6ed50c8443a778fbddb4dbd8a39d49d4 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/106] s3:utils: Remove obsolete force encryption from
+Subject: [PATCH 038/107] 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 21b72b6107cd849b9da77e17520e658745fb897a 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/106] s3:utils: Remove obsolete force encryption from
+Subject: [PATCH 039/107] 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 842c3c1346cba54c92d6ba2d462818875403a394 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/106] s3:utils: Remove obsolete force encryption from
+Subject: [PATCH 040/107] 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 be36aec550d817bbcfdea88b433e31b44886ba19 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/106] s3:rpcclient: Remove obsolete force encryption from
+Subject: [PATCH 041/107] 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 8e2de7801238eb7f1090a9307dc4b05885b3dda2 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/106] examples: Remove obsolete force encryption from
+Subject: [PATCH 042/107] examples: Remove obsolete force encryption from
smb2mount
Signed-off-by: Andreas Schneider <asn@samba.org>
@@ -4909,7 +4909,7 @@ index 6206c3a9701..c64be573462 100644
From 8c9a31cc180c674925919771ccdce1bb6895c1a3 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/106] s3:libsmb: Make cli_cm_force_encryption_creds()
+Subject: [PATCH 043/107] 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 6e2a7196c424edd2c447cfd4377e38e5b51ee675 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/106] s4:libcli: Return NTSTATUS errors for
+Subject: [PATCH 044/107] 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 cf89573a78556993d7ecb43257d347edc6c61151 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/106] s4:libcli: Return if encryption is requested for SMB1
+Subject: [PATCH 045/107] 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 05914c4f85f71c7d1df884e33b8c0b8f5062ee3b 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/106] s3:libcli: Split out smb2_connect_tcon_start()
+Subject: [PATCH 046/107] 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 63b0086d8ffdfca44134c09ff0db76d7a9ae8f6c 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/106] s4:libcli: Add smb2_connect_enc_start()
+Subject: [PATCH 047/107] 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 8bc1b5f884d1e6a88e1ac403d9bc64c3b77e9428 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/106] s4:libcli: Require signing for SMB encryption
+Subject: [PATCH 048/107] 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 5cc8a0bc7381444804cde992afdc7aa0c0b70074 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/106] python:tests: Add test for SMB encrypted DCERPC
+Subject: [PATCH 049/107] 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 546ecfae4f11e0625de86e47e90a98a7aafa0453 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/106] auth:gensec: Add gensec_security_sasl_names()
+Subject: [PATCH 050/107] auth:gensec: Add gensec_security_sasl_names()
Pair-Programmed-With: Andreas Schneider <asn@samba.org>
@@ -5525,7 +5525,7 @@ index d2d62d6652e..4eb45643714 100644
From ec079d88720a99a5bc5e6b5efd03f87342364f15 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/106] s4:ldap_server: Use samba_server_gensec_start() in
+Subject: [PATCH 051/107] 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 bc128ea1ea455a3a63e0ce3dc8777a7482c356f8 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/106] auth:gensec: Make gensec_use_kerberos_mechs() a
+Subject: [PATCH 052/107] 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 37b7016fba1eae75fc4a87c9c5aebbbb47b7ff39 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/106] auth:gensec: Pass use_kerberos and keep_schannel to
+Subject: [PATCH 053/107] 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 0579dbd6faa5a828cff42cd797f78c51316324b0 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/106] auth:gensec: If Kerberos is required, keep schannel
+Subject: [PATCH 054/107] 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 0f3676f4f84184b5bf83101e0b1eca0bb05a5079 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/106] auth:creds: Add cli_credentials_init_server()
+Subject: [PATCH 055/107] 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 e1d566c2962ebd5596638df6f81fd120aaf32fcd 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/106] s4:rpc_server: Use cli_credentials_init_server()
+Subject: [PATCH 056/107] 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 694e1d1ca62372baba69818acf25a2eec8847115 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/106] s4:smb_server: Use cli_credentials_init_server() for
+Subject: [PATCH 057/107] 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 c3b277172554d1d3155c3a1b4ad76685985273df 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/106] selftest: Rename 'smb encrypt' to 'server smb
+Subject: [PATCH 058/107] 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 0a8cefa811d..a31165b372d 100755
From 355afa22953cf8838dc83210315bc2557e764082 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/106] selftest: Move enc_desired to provision to have it in
+Subject: [PATCH 059/107] 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 a31165b372d..eda2c428793 100755
From 2a8b98850f61219a1c97da9151e55d0e21a4265b 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/106] s3:tests: Add smbclient tests for 'client smb
+Subject: [PATCH 060/107] s3:tests: Add smbclient tests for 'client smb
encrypt'
Signed-off-by: Andreas Schneider <asn@samba.org>
@@ -6251,7 +6251,7 @@ index d05de6bd08c..ec967caea2e 100755
From 45ebf91c66a23488c0835ba038eca345db984106 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/106] s3:client: Remove global smb_encrypt
+Subject: [PATCH 061/107] 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 30287ffd253..e1128bf4a8c 100644
From 088473e47bcb30fe3b179133265da9ea6b8ec684 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/106] s3:libsmb: Remove force_encrypt from cli_cm_open()
+Subject: [PATCH 062/107] 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 0291ff12056c914b3f9429a5bba48190897fe6c1 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/106] s3:libsmb: Remove force_encrypt from cli_cm_connect()
+Subject: [PATCH 063/107] 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 32f7fd016ecbeb3b24ad93d593ba06e8292dd02f 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/106] s3:libsmb: Remove force_encrypt from clidfs
+Subject: [PATCH 064/107] 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 4afc92a55aa63557db2b4e2a9b0bbe5bc7d12c55 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/106] s3:libsmb: Remove force_encrypt from
+Subject: [PATCH 065/107] 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 2c50d0ba7eec6d37943b7afdf426b114c9e1f292 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/106] s3:libsmb: Pass cli_credentials to clidfs
+Subject: [PATCH 066/107] 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 608c0b87761f75e539b2e1e7599ceb981770b647 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/106] s3:libsmb: Pass cli_credentials to cli_cm_connect()
+Subject: [PATCH 067/107] 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 d6d5da0e28c3879280e1139f51bfe2ef03bc450e 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/106] s3:libsmb: Pass cli_credentials to cli_cm_open()
+Subject: [PATCH 068/107] 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 1c07abb4b9690b62b2ae7841134d7a71e4771bb9 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/106] s3:libsmb: Pass cli_credentials to
+Subject: [PATCH 069/107] 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 100dad122572d927889f4c03b19f169a3bf61df4 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/106] s3:client: Remove global max_protocol
+Subject: [PATCH 070/107] 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 23de5befee3..329463795e0 100644
From fecf06bd00bc8ff23634bded86d649e432431957 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/106] s3:libsmb: Remove max_protocol from cli_cm_open()
+Subject: [PATCH 071/107] 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 2af136fd7c1ecae9cc06bc2cf26a7feac16cb279 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/106] s3:libcmb: Remove max_protocol from cli_cm_connect()
+Subject: [PATCH 072/107] 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 dc8cfd9551afa10b0610c6663cb28bfb1ec5888a 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/106] s3:libsmb: Remove max_protocol from clidfs
+Subject: [PATCH 073/107] 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 3a99225868e079e108968552f43b937b5b9b702f 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/106] s3:include: Move loadparm prototypes to own header
+Subject: [PATCH 074/107] 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 076e6929c3c8d1dc161e7dacfc7fb7aeceb588bd 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/106] s3:lib: Move interface prototypes to own header file
+Subject: [PATCH 075/107] 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 b6d36e462fe41f7b88bbf120831c3765c40ef326 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/106] idl: Add SID_SAMBA_SMB3
+Subject: [PATCH 076/107] 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 3128ed8c26c13ccc068b5e50ae52604f5ffc9241 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/106] s3:smbd: Add SMB3 connection information to session
+Subject: [PATCH 077/107] 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 333ae30e7f8238c684d2a1aec2b0516369068a7e 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/106] librpc: Add dcerpc helper
+Subject: [PATCH 078/107] 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 4a2e7909f3a40c6ab82c045a5a54f8604a6f1dd2 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/106] s3:smbd: Use defines to set 'srv_smb_encrypt'
+Subject: [PATCH 079/107] 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 69b9e46fa29adcf5a478a240ea6980bf7d97ae4b 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/106] s3:rpc_server: Allow to use RC4 for setting passwords
+Subject: [PATCH 080/107] 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 110323b646715aabd4468d70773c2d94968f2e99 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/106] s4:rpc_server: Allow to use RC4 for setting passwords
+Subject: [PATCH 081/107] 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 6353a991bc6d35b9468867c0e809e752b060da9b 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/106] lib:crypto: Add py binding for set_relax/strict fips
+Subject: [PATCH 082/107] 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 525072939b9292a1744f929803a9597b5f725f9a 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/106] s4:param: Add 'weak crypto' getter to pyparam
+Subject: [PATCH 083/107] 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 c7dfaf75a8f8bdb18c42325c470bdee8e600d930 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/106] python:tests: Add SAMR password change tests for fips
+Subject: [PATCH 084/107] 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 9dfef9d7129babedfdc0fddd60f76859f44fe7c1 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/106] python:tests: Add SAMR password change tests for fips
+Subject: [PATCH 085/107] 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 8e8b9d33f25c7ef89fdf4af90821ea4de77525e1 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/106] auth:creds: Rename CRED_USE_KERBEROS values
+Subject: [PATCH 086/107] 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 6a356a6e79fa76de18a4ca0760ac4f053d70137f 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/106] auth:creds:tests: Migrate test to a cmocka unit test
+Subject: [PATCH 087/107] 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 f6a4f70007e5c5ad1df3ddb018bde8568fc63f57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnther=20Deschner?= <gd@samba.org>
Date: Mon, 2 Nov 2020 16:10:44 +0100
-Subject: [PATCH 088/106] s3-vfs_glusterfs: always disable write-behind
+Subject: [PATCH 088/107] s3-vfs_glusterfs: always disable write-behind
translator
The "pass-through" option has now been merged upstream as of:
@@ -11180,7 +11180,7 @@ index 335cfd797f1..9920432a360 100644
From 0d6268ff0a055e8fb418da761eeb820a8e11e2ad Mon Sep 17 00:00:00 2001
From: Isaac Boukris <iboukris@gmail.com>
Date: Thu, 20 Aug 2020 12:09:05 +0200
-Subject: [PATCH 089/106] Add smb2cli_session_get_encryption_cipher()
+Subject: [PATCH 089/107] 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).
@@ -11237,7 +11237,7 @@ index 2afc7165cd9..db5f5d58799 100644
From 3f77e6cb6220d50b75ceb197e26813e9e5244cc0 Mon Sep 17 00:00:00 2001
From: Isaac Boukris <iboukris@gmail.com>
Date: Thu, 20 Aug 2020 12:18:21 +0200
-Subject: [PATCH 090/106] Add dcerpc_transport_encrypted()
+Subject: [PATCH 090/107] Add dcerpc_transport_encrypted()
Signed-off-by: Isaac Boukris <iboukris@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
@@ -11329,7 +11329,7 @@ index bd79a072bc8..6ea27a8d9a3 100644
From 4045c677a3ea3c44e5509025c1c7d03936ba9d82 Mon Sep 17 00:00:00 2001
From: Isaac Boukris <iboukris@gmail.com>
Date: Thu, 20 Aug 2020 12:35:01 +0200
-Subject: [PATCH 091/106] Add py binding for dcerpc_transport_encrypted
+Subject: [PATCH 091/107] Add py binding for dcerpc_transport_encrypted
Signed-off-by: Isaac Boukris <iboukris@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
@@ -11376,7 +11376,7 @@ index be914ed5f14..309a6d72e26 100644
From 07a87eaff7e2e18c2d462f4caff95cace92a0130 Mon Sep 17 00:00:00 2001
From: Isaac Boukris <iboukris@gmail.com>
Date: Thu, 20 Aug 2020 12:44:08 +0200
-Subject: [PATCH 092/106] selftest: add a test for py dce transport_encrypted
+Subject: [PATCH 092/107] selftest: add a test for py dce transport_encrypted
Signed-off-by: Isaac Boukris <iboukris@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
@@ -11441,7 +11441,7 @@ index 8e0d6a5ef0a..24e4ac77d89 100644
From 1c74d87e4dfe78d6e884c9bb4e57ec383d632a88 Mon Sep 17 00:00:00 2001
From: Isaac Boukris <iboukris@gmail.com>
Date: Thu, 20 Aug 2020 12:47:12 +0200
-Subject: [PATCH 093/106] Add CreateTrustedDomainRelax wrapper for fips mode
+Subject: [PATCH 093/107] Add CreateTrustedDomainRelax wrapper for fips mode
Signed-off-by: Isaac Boukris <iboukris@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
@@ -11527,7 +11527,7 @@ index 00000000000..b4df0fa5bb8
From 067c8d73800b928b02bcb1095c13083d9e0e368d Mon Sep 17 00:00:00 2001
From: Isaac Boukris <iboukris@gmail.com>
Date: Thu, 20 Aug 2020 12:49:17 +0200
-Subject: [PATCH 094/106] Use the new CreateTrustedDomainRelax()
+Subject: [PATCH 094/107] Use the new CreateTrustedDomainRelax()
Signed-off-by: Isaac Boukris <iboukris@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
@@ -11634,7 +11634,7 @@ index 1d12c362911..93a3258d28d 100644
From 72dfcc923d0cf8054cb0f011e8405fa96b9ec6e0 Mon Sep 17 00:00:00 2001
From: Isaac Boukris <iboukris@gmail.com>
Date: Tue, 1 Sep 2020 20:14:29 +0300
-Subject: [PATCH 095/106] selftest: add a test for the CreateTrustedDomainRelax
+Subject: [PATCH 095/107] selftest: add a test for the CreateTrustedDomainRelax
wrapper
Originally copied from 'source4/scripting/devel/createtrust'
@@ -11819,7 +11819,7 @@ index 3a903a7eee0..96f51b68cfc 100755
From 341cc046bf816ad5818932c6c5d170a2a9a38783 Mon Sep 17 00:00:00 2001
From: Isaac Boukris <iboukris@gmail.com>
Date: Thu, 5 Nov 2020 15:38:19 +0200
-Subject: [PATCH 096/106] Remove source4/scripting/devel/createtrust script
+Subject: [PATCH 096/107] Remove source4/scripting/devel/createtrust script
We now have the 'samba-tool domain trust' command.
@@ -11974,7 +11974,7 @@ index 26b0d0dcb68..00000000000
From f51b23a9b8ad22d4cd4d7dea3ed8f0150974a209 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Fri, 6 Nov 2020 14:30:26 +0100
-Subject: [PATCH 097/106] s3:rpc_server: Use gnutls_cipher_decrypt() in
+Subject: [PATCH 097/107] s3:rpc_server: Use gnutls_cipher_decrypt() in
get_trustdom_auth_blob()
It doesn't matter for RC4, but just to be correct.
@@ -12006,7 +12006,7 @@ index 198387424e6..e749caf2551 100644
From 7b24fdcb4a797b1daa97750f8a2c4f2c603115f3 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Fri, 6 Nov 2020 14:33:38 +0100
-Subject: [PATCH 098/106] s4:rpc_server: Use gnutls_cipher_decrypt() in
+Subject: [PATCH 098/107] s4:rpc_server: Use gnutls_cipher_decrypt() in
get_trustdom_auth_blob()
It doesn't matter for RC4, but just to be correct.
@@ -12038,7 +12038,7 @@ index 8333cb149b6..4bb8aaa9592 100644
From acbb59f45cb2b4c35df678ba774425180e9cf8c6 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Thu, 20 Aug 2020 13:40:21 +0200
-Subject: [PATCH 099/106] s3:rpc_server: Allow to use RC4 for creating trusts
+Subject: [PATCH 099/107] 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>
@@ -12105,7 +12105,7 @@ index e749caf2551..d6d606ddeca 100644
From a4d0e69eb7a429a13e456cff7f96870e87791694 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Thu, 20 Aug 2020 13:51:39 +0200
-Subject: [PATCH 100/106] s4:rpc_server: Allow to use RC4 for creating trusts
+Subject: [PATCH 100/107] 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>
@@ -12177,7 +12177,7 @@ index 4bb8aaa9592..5b3ef71d458 100644
From f327133ced90a52d1ff9e104b1722876b21b7a78 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Fri, 6 Nov 2020 10:13:48 +0100
-Subject: [PATCH 101/106] sefltest: Enable the dcerpc.createtrustrelax test
+Subject: [PATCH 101/107] sefltest: Enable the dcerpc.createtrustrelax test
against ad_dc_fips
Signed-off-by: Andreas Schneider <asn@samba.org>
@@ -12207,7 +12207,7 @@ index 80effda8343..00000000000
From 721f97817de2d1e14d99459f9e6af9fccf11b621 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Thu, 5 Nov 2020 15:48:08 -0800
-Subject: [PATCH 102/106] s3: spoolss: Make parameters in call to
+Subject: [PATCH 102/107] s3: spoolss: Make parameters in call to
user_ok_token() match all other uses.
We already have p->session_info->unix_info->unix_name, we don't
@@ -12247,7 +12247,7 @@ index e98401a4365..906fab2adb5 100644
From a078205ce3816c175cd16dc22875dc147a5da645 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Wed, 11 Nov 2020 13:42:06 +0100
-Subject: [PATCH 103/106] s3:smbd: Fix possible null pointer dereference in
+Subject: [PATCH 103/107] s3:smbd: Fix possible null pointer dereference in
token_contains_name()
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14572
@@ -12283,7 +12283,7 @@ index 57754a0f766..694c0c290e8 100644
From 5654101584b7742e684d12e6aea43e5004142dcb Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <ab@samba.org>
Date: Tue, 10 Nov 2020 17:35:24 +0200
-Subject: [PATCH 104/106] lookup_name: allow lookup names prefixed with DNS
+Subject: [PATCH 104/107] 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
@@ -12393,7 +12393,7 @@ index 82c47b3145b..864246da56e 100644
From efa59aa4b2455ea3bc4d0fd0358b160858626585 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <ab@samba.org>
Date: Wed, 11 Nov 2020 14:42:55 +0200
-Subject: [PATCH 105/106] auth_sam: use pdb_get_domain_info to look up DNS
+Subject: [PATCH 105/107] 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
@@ -12616,7 +12616,7 @@ index 3c12f959faf..e8e0d543f8c 100644
From b79d352f075faab806cc4daf5ed03a0fc3266158 Mon Sep 17 00:00:00 2001
From: Andreas Schneider <asn@samba.org>
Date: Fri, 27 Nov 2020 11:22:15 +0100
-Subject: [PATCH 106/106] docs-xml: Add a section about weak crypto in testparm
+Subject: [PATCH 106/107] docs-xml: Add a section about weak crypto in testparm
manpage
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14583
@@ -12655,3 +12655,42 @@ index 9099cda010f..7c7abf50e8b 100644
--
2.28.0
+
+From e7c5dc98f988afc5377390369f6094474e39e09d Mon Sep 17 00:00:00 2001
+From: Isaac Boukris <iboukris@gmail.com>
+Date: Tue, 14 Jul 2020 22:38:06 +0200
+Subject: [PATCH 107/107] s3-libads: Pass timeout to open_socket_out in ms
+
+BUG: https://bugzilla.samba.org/show_bug.cgi?id=13124
+
+Signed-off-by: Isaac Boukris <iboukris@samba.org>
+Reviewed-by: Andreas Schneider <asn@samba.org>
+
+Autobuild-User(master): Andreas Schneider <asn@cryptomilk.org>
+Autobuild-Date(master): Thu Jul 16 10:41:40 UTC 2020 on sn-devel-184
+
+(cherry picked from commit d67e9149a612044e247e7a4d78913ecf396c69fc)
+---
+ source3/libads/ldap.c | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/source3/libads/ldap.c b/source3/libads/ldap.c
+index 10ab043f721..ee4628a09a2 100755
+--- a/source3/libads/ldap.c
++++ b/source3/libads/ldap.c
+@@ -96,9 +96,11 @@ static void gotalarm_sig(int signum)
+ {
+ int fd = -1;
+ NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
++ unsigned timeout_ms = 1000 * to;
+
+- status = open_socket_out(ss, port, to, &fd);
++ status = open_socket_out(ss, port, timeout_ms, &fd);
+ if (!NT_STATUS_IS_OK(status)) {
++ DEBUG(3, ("open_socket_out: failed to open socket\n"));
+ return NULL;
+ }
+
+--
+2.28.0
+
diff --git a/SPECS/samba.spec b/SPECS/samba.spec
index a91931a..931f58a 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 4
+%global main_release 5
%global samba_version 4.13.2
%global talloc_version 2.3.1
@@ -3776,6 +3776,9 @@ fi
%endif
%changelog
+* Fri Dec 04 2020 Andreas Schneider <asn@redhat.com> - 4.13.2-5
+- resolves: #1904174 - Fix ldap timeout with 'net ads join'
+
* Fri Nov 27 2020 Andreas Schneider <asn@redhat.com> - 4.13.2-4
- resolves: #1902198 - Document weak crypto output of testparm