rpms
/
samba
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update to Samba 4.13.4 

Guenther
This commit is contained in:
Günther Deschner 2021-01-26 15:04:19 +01:00
parent fe07656b85
commit 74b988a0b9
6 changed files with 129 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -229,3 +229,5 @@ samba-3.6.0pre1.tar.gz
/samba-4.13.2.tar.asc
/samba-4.13.3.tar.xz
/samba-4.13.3.tar.asc
/samba-4.13.4.tar.xz
/samba-4.13.4.tar.asc

BIN
gpgkey-52FBC0B86D954B0843324CDC6F33915B6568B7EA.gpg
View File

Binary file not shown.

240
samba-4.13-redhat.patch
View File

@ -1,4 +1,4 @@
From 4e5d178f9367f4e51b387b7d4df1e8407b15fafc Mon Sep 17 00:00:00 2001
From 2d3ad48f0c7337cda08a6588b06183120fc0731a 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/104] libcli:smb2: Do not leak ptext on error
@ -10,10 +10,10 @@ Reviewed-by: Stefan Metzmacher <metze@samba.org>
1 file changed, 1 insertion(+)
diff --git a/libcli/smb/smb2_signing.c b/libcli/smb/smb2_signing.c
index cc03607d789..4d430f56df5 100644
index 230475480c2..cfb3b613f9d 100644
--- a/libcli/smb/smb2_signing.c
+++ b/libcli/smb/smb2_signing.c
@@ -520,6 +520,7 @@ NTSTATUS smb2_signing_encrypt_pdu(struct smb2_signing_key *encryption_key,
@@ -515,6 +515,7 @@ NTSTATUS smb2_signing_encrypt_pdu(struct smb2_signing_key *encryption_key,
ctext = talloc_size(talloc_tos(), ctext_size);
if (ctext == NULL) {
@ -25,7 +25,7 @@ index cc03607d789..4d430f56df5 100644
2.29.2
From 1310c58c3b8b9c7fcb0c811a9ef24b3bbe8c16f1 Mon Sep 17 00:00:00 2001
From 630c6314778894a668c20fe2aa7d04627ed517a7 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/104] libcli:smb2: Use talloc NULL context if we don't have
@ -44,10 +44,10 @@ Reviewed-by: Stefan Metzmacher <metze@samba.org>
1 file changed, 26 insertions(+), 4 deletions(-)
diff --git a/libcli/smb/smb2_signing.c b/libcli/smb/smb2_signing.c
index 4d430f56df5..6ece5f2e4d3 100644
index cfb3b613f9d..b1e0253948f 100644
--- a/libcli/smb/smb2_signing.c
+++ b/libcli/smb/smb2_signing.c
@@ -511,14 +511,25 @@ NTSTATUS smb2_signing_encrypt_pdu(struct smb2_signing_key *encryption_key,
@@ -506,14 +506,25 @@ NTSTATUS smb2_signing_encrypt_pdu(struct smb2_signing_key *encryption_key,
uint8_t *ctext = NULL;
size_t len = 0;
int i;
@ -75,7 +75,7 @@ index 4d430f56df5..6ece5f2e4d3 100644
if (ctext == NULL) {
TALLOC_FREE(ptext);
status = NT_STATUS_NO_MEMORY;
@@ -710,16 +721,27 @@ NTSTATUS smb2_signing_decrypt_pdu(struct smb2_signing_key *decryption_key,
@@ -705,16 +716,27 @@ NTSTATUS smb2_signing_decrypt_pdu(struct smb2_signing_key *decryption_key,
uint8_t *ptext = NULL;
size_t len = 0;
int i;
@ -109,7 +109,7 @@ index 4d430f56df5..6ece5f2e4d3 100644
2.29.2
From ff15d93d1009a23428b9c11090836624255924cd Mon Sep 17 00:00:00 2001
From 63cefdebe5c0e435b6174ff6bc72b48d12cec312 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/104] auth:creds: Introduce CRED_SMB_CONF
@ -205,7 +205,7 @@ index d2a81506de3..6454ac9ff7c 100644
2.29.2
From cc5e70efc8b9f45054d7e57002f59ac38c4c687f Mon Sep 17 00:00:00 2001
From 0120aad504663c5e75054c2e322f1277acae63dd 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/104] param: Add 'server smb encrypt' parameter
@ -740,12 +740,12 @@ index a3abaa2ec67..c0070b716a5 100644
.durable_handles = true,
.check_parent_directory_delete_on_close = false,
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index ed38121f292..a263c33b7e2 100644
index 3802d16179b..9aa89e3eb02 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -567,9 +567,9 @@ static NTSTATUS make_connection_snum(struct smbXsrv_connection *xconn,
conn->case_preserve = lp_preserve_case(snum);
conn->short_case_preserve = lp_short_preserve_case(snum);
@@ -558,9 +558,9 @@ static NTSTATUS make_connection_snum(struct smbXsrv_connection *xconn,
/* Case options for the share. */
conn_setup_case_options(conn);
- conn->encrypt_level = lp_smb_encrypt(snum);
+ conn->encrypt_level = lp_server_smb_encrypt(snum);
@ -824,7 +824,7 @@ index 7acde285a90..b745e0906b1 100644
2.29.2
From d78374a9e26428a48b3c6a2aa1d4280751620fb9 Mon Sep 17 00:00:00 2001
From a351d15240e7c8638883155404fe2f3d70029e7e 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/104] param: Create and use enum_smb_encryption_vals
@ -899,7 +899,7 @@ index 47b85de1f87..e2f737279dc 100644
{MDNS_NAME_NETBIOS, "netbios"},
{MDNS_NAME_MDNS, "mdns"},
diff --git a/libcli/smb/smb_constants.h b/libcli/smb/smb_constants.h
index b424b13cde4..2fb1fd7189e 100644
index d2345f094e1..8ee99e25566 100644
--- a/libcli/smb/smb_constants.h
+++ b/libcli/smb/smb_constants.h
@@ -106,6 +106,15 @@ enum smb_signing_setting {
@ -922,7 +922,7 @@ index b424b13cde4..2fb1fd7189e 100644
2.29.2
From e2e0decfb117a8d6bb1428509f770315849e972b Mon Sep 17 00:00:00 2001
From 021975ea03413244d02d35940973f67956adec2b 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/104] s3:smbd: Use 'enum smb_encryption_setting' values
@ -952,11 +952,11 @@ index c0070b716a5..4ad541301b3 100644
.durable_handles = true,
.check_parent_directory_delete_on_close = false,
diff --git a/source3/smbd/service.c b/source3/smbd/service.c
index a263c33b7e2..43803e721c2 100644
index 9aa89e3eb02..d7d17d3dee1 100644
--- a/source3/smbd/service.c
+++ b/source3/smbd/service.c
@@ -568,16 +568,16 @@ static NTSTATUS make_connection_snum(struct smbXsrv_connection *xconn,
conn->short_case_preserve = lp_short_preserve_case(snum);
@@ -559,16 +559,16 @@ static NTSTATUS make_connection_snum(struct smbXsrv_connection *xconn,
conn_setup_case_options(conn);
conn->encrypt_level = lp_server_smb_encrypt(snum);
- if (conn->encrypt_level > SMB_SIGNING_OFF) {
@ -1046,7 +1046,7 @@ index b745e0906b1..2f2fdcb7260 100644
2.29.2
From a461b9e0348f2f082cc59b601271ca5b3283df09 Mon Sep 17 00:00:00 2001
From 7153b9b229a2feea129f1bb1cd423dd4e79d5a05 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/104] docs-xml: Add 'client smb encrypt'
@ -1224,7 +1224,7 @@ index 4ad541301b3..6418a42b6eb 100644
2.29.2
From d55143fc3090b43390fdf14ff45d9c2971fc43d2 Mon Sep 17 00:00:00 2001
From f151e19473330373801c4d85ef3d5ce0918ac17d 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/104] lib:param: Add lpcfg_parse_enum_vals()
@ -1291,7 +1291,7 @@ index 323fcf84523..e66ce2324b4 100644
2.29.2
From d01ae8111553a71b80988eeb737e8b80bc765b20 Mon Sep 17 00:00:00 2001
From 6364c5bcde41ed5bdb478747511003796a601e74 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/104] libcli:smb: Add smb_signing_setting_translate()
@ -1464,7 +1464,7 @@ index 6918e1306c3..20981754db4 100644
2.29.2
From 4cef2825a3363a38fbfbff5f172053145f62f100 Mon Sep 17 00:00:00 2001
From 8ceec22ead224c3581b18b0fc95cb7f7f9c061a8 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/104] libcli:smb: Add smb_encryption_setting_translate()
@ -1558,7 +1558,7 @@ index da0e4db2bf3..ac2887ee5c4 100644
2.29.2
From a0cb6b810b655298ce5b87d8e36d1089460feca7 Mon Sep 17 00:00:00 2001
From dc53c158acdeffc6e53436359a56bcf7071b3d83 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/104] s3:lib: Use smb_signing_setting_translate for cmdline
@ -1609,7 +1609,7 @@ index 90ee67c4cb7..bc1f1c3ed25 100644
}
diff --git a/source3/wscript_build b/source3/wscript_build
index 5a07eddac44..6a08afe4a25 100644
index d86a9fcadbf..c1051c62393 100644
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -279,7 +279,7 @@ bld.SAMBA3_LIBRARY('popt_samba3_cmdline',
@ -1625,7 +1625,7 @@ index 5a07eddac44..6a08afe4a25 100644
2.29.2
From ef521e6b44710fb3ed567d36fa56687b677fe58a Mon Sep 17 00:00:00 2001
From c6f52fc629ca09e450b3bd0c1bdc56fdabeae141 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/104] auth:creds: Remove unused credentials autoproto
@ -1705,7 +1705,7 @@ index 7711eac2afa..d9be3562adb 100644
2.29.2
From 6fafcebb8bd6311a736d995af6641e68e43e03a1 Mon Sep 17 00:00:00 2001
From 62bca83b540c9402d86f0668839150d2abf3adec 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/104] auth:creds: Add
@ -1847,7 +1847,7 @@ index 68f1f25dce1..9cde0000b5f 100644
2.29.2
From 64e2c99501677bfe52212c9ea99ec3512cf62f6e Mon Sep 17 00:00:00 2001
From a14f3c5f3f39173650bd56ee034bd35ea111ee07 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/104] auth:creds: Add python bindings for
@ -1973,7 +1973,7 @@ index 6454ac9ff7c..e5f8122fa21 100644
2.29.2
From 1280505f1396925851db5a29f2465d9c31d45f88 Mon Sep 17 00:00:00 2001
From 9fdc98da5c625acd11205b2bb28deb780ef905ec 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/104] auth:creds: Add
@ -2105,7 +2105,7 @@ index 9cde0000b5f..54e8271471f 100644
2.29.2
From 32209d254bb7bd3bd6ad3af14f219cee306a19a3 Mon Sep 17 00:00:00 2001
From d8e43a7c8058a6a395493360cf2faae24f64e2e2 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/104] auth:creds: Add python bindings for
@ -2210,7 +2210,7 @@ index e5f8122fa21..8edf13ce6ff 100644
2.29.2
From d0a1bf1a75426c1d334349a6a4f8e44c80c1915b Mon Sep 17 00:00:00 2001
From 767d356f718965b4595b8322729556b63e66425d 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/104] auth:creds: Add
@ -2344,7 +2344,7 @@ index 54e8271471f..3b86b742448 100644
2.29.2
From 36ab2aa54102aa9cce92ac8ebf250db4d460324e Mon Sep 17 00:00:00 2001
From 88dd0d8871ae2a54bc089f1e761ded6940b270b0 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/104] auth:creds: Add python bindings for
@ -2462,7 +2462,7 @@ index 8edf13ce6ff..e0a6248d37a 100644
2.29.2
From f866d9e80964e16307a8376ed448d0ca3a987538 Mon Sep 17 00:00:00 2001
From 41df2d5330c051066691576af9ccf505cb0573e3 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/104] auth:creds: Add python bindings for
@ -2590,7 +2590,7 @@ index e0a6248d37a..6187bded0b6 100644
2.29.2
From 3f55ee05f024eacdd43fbbfb941703f8555df7c7 Mon Sep 17 00:00:00 2001
From cdb470d7c408baa07eabf83ec566baecc8e5138c 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/104] auth:creds: Bump library version
@ -2620,7 +2620,7 @@ index 564a04fe8dd..1e3302e3e48 100644
2.29.2
From 492030e0e6179bdc0311e8d03b89b1cb01de1a3e Mon Sep 17 00:00:00 2001
From a11a02e0802dbb3300d9b3232b936b74b1f89a32 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/104] s3:lib: Use cli_credential_(get|set)_smb_signing()
@ -2691,7 +2691,7 @@ index bc1f1c3ed25..6038ec11515 100644
2.29.2
From 6164c45feff5daf0e751526d1f7bd599c61b2a0e Mon Sep 17 00:00:00 2001
From 6e5fba172b910545f722d33aa3fb185f48492c18 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/104] s3:lib: Set smb encryption also via cli creds API
@ -2720,7 +2720,7 @@ index 6038ec11515..9c9e2f0ac0f 100644
2.29.2
From ddb7926bba603afbc1a588d1b6da9f9a625881ac Mon Sep 17 00:00:00 2001
From 01eb7d2f16a4f16931a0adffc395ec0b5946ef56 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/104] python: Remove unused sign argument from
@ -2775,7 +2775,7 @@ index 1e2c2918ebe..ad60cda0690 100644
2.29.2
From 8683eacfb9c053115a84be025bbd64471c55d1c8 Mon Sep 17 00:00:00 2001
From 7ad70308d9f5b5d892e507a58eb946839be33374 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/104] python: Set smb signing via the creds API
@ -2879,7 +2879,7 @@ index ad60cda0690..0f2f6520fc3 100644
2.29.2
From 86212ac5fb8d5f0710f23dde362dc35d908e3047 Mon Sep 17 00:00:00 2001
From 70b7a6d80c3699727f7bf36a4a9255bb90c67cec 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/104] s3:libsmb: Introduce CLI_FULL_CONNECTION_IPC
@ -3102,7 +3102,7 @@ index 6cea2ee306c..2241beb331f 100644
2.29.2
From 834dae6a34aaef7dccfb84821ec3fa7013b07d15 Mon Sep 17 00:00:00 2001
From 19ac5889da3b5bec1fddba0e08daed7cbe24f604 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/104] s3:pylibsmb: Add ipc=True support for
@ -3167,7 +3167,7 @@ index 3fcc3424a57..3579a040830 100644
2.29.2
From 072dfd83ee6513658e0ec818fb548f70648d6a41 Mon Sep 17 00:00:00 2001
From ff93a26bdd480edb3e488b207b1fb6529cd52a38 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/104] python:tests: Mark libsmb connection as an IPC
@ -3196,7 +3196,7 @@ index ba7440df13b..2c028d381db 100644
2.29.2
From ceb25f6cb4fd07cd736085030a02aefbcb012e34 Mon Sep 17 00:00:00 2001
From b904f4bf9279264438e7b50ba90930562f4146fa 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/104] python:tests: Set smb ipc signing via the creds API
@ -3234,7 +3234,7 @@ index 2c028d381db..d6f5de7440a 100644
2.29.2
From d3fe919fa5b952d075353f0d5c5366cabd5ef976 Mon Sep 17 00:00:00 2001
From 19c1b06e7ca4ae26f36207b7dd070b33a853ff29 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/104] s3:libsmb: Use 'enum smb_signing_setting' in
@ -3364,7 +3364,7 @@ index d214cdabca4..995187e21b4 100644
2.29.2
From 0ec1b432bf807efe37fdedf346724e787742e3aa Mon Sep 17 00:00:00 2001
From 8ecad37d1fcc8d6fe07560df1bab35f2f70595f7 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/104] s3:client: Turn off smb signing for message op
@ -3516,7 +3516,7 @@ index 3579a040830..f8a4d56cf53 100644
2.29.2
From dd6a89dd02e675e1b836042e4a4dec31667ac58c Mon Sep 17 00:00:00 2001
From 5325ea198e03bf4a51b101c74788df548eeedbac 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/104] s3:libsmb: Remove signing_state from
@ -3615,7 +3615,7 @@ index f8a4d56cf53..c7a2d73afcb 100644
2.29.2
From b31e224159fe25e8cf84e7d2ef8bc53934ddd209 Mon Sep 17 00:00:00 2001
From 1517d0eb1036056851871e994849c647217ef36d 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/104] s3:libsmb: Remove signing_state from
@ -3986,7 +3986,7 @@ index 954d6eba804..fea066ce468 100644
2.29.2
From 49430d65ac0e11cdfec07c55b72f030c959f576f Mon Sep 17 00:00:00 2001
From 07ccfed08ceadd0b7497e7259e855b1937522129 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/104] s3:libsmb: Add encryption support to
@ -4203,7 +4203,7 @@ index b24743d789b..abfd18bfaf1 100644
2.29.2
From cc6eca3fe233c16d879f9a76aae022320e7044d7 Mon Sep 17 00:00:00 2001
From bf05adca0d32212d4eead676ef89d4a96d3949a0 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/104] python: Add a test for SMB encryption
@ -4277,7 +4277,7 @@ index e8f8e7fe94d..81d4e482644 100644
2.29.2
From 3bb0f6be56244767f78e8d0e085f2f7555585225 Mon Sep 17 00:00:00 2001
From 86954cbf471bf391f50866d5d983c57cf8a4f064 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/104] s3:net: Use cli_credentials_set_smb_encryption()
@ -4326,7 +4326,7 @@ index b139fb2d0da..5829d891075 100644
2.29.2
From 16aaa2f7395d235f72582a5190c9bf5d90578b9d Mon Sep 17 00:00:00 2001
From 1d065c5960ea2bce6bab5420476a0c21ba40d26e 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/104] s3:libsmb: Use cli_credentials_set_smb_encryption()
@ -4685,7 +4685,7 @@ index ec4a516b2ee..61503d0a98b 100644
2.29.2
From eaa0bdc5931b82f9adbb65070252208be26a9d28 Mon Sep 17 00:00:00 2001
From a35be10e055edb18b961c30c106fbefd08cd8c42 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/104] s3:client: Remove unused smb encryption code
@ -4721,7 +4721,7 @@ index f56dc323b6e..16a8d44c069 100644
2.29.2
From 63179da4a51fefc5d938339360d579f725875389 Mon Sep 17 00:00:00 2001
From 59362e873109a541d5381fe9a302a9464b83b549 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/104] s3:utils: Remove obsolete force encryption from
@ -4758,7 +4758,7 @@ index 5983ebbd0a5..8fd9fcc5780 100644
2.29.2
From f113666b62c0fbe960f9ac22aea63241b56ffc61 Mon Sep 17 00:00:00 2001
From d642ed3f0e60699c5650eb80ba02f9552b8f7bd9 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/104] s3:utils: Remove obsolete force encryption from
@ -4792,7 +4792,7 @@ index 2ac4fde7daf..ef2657e4fa5 100644
2.29.2
From 4f3770237e1a3d41c725560d9e5c14786b98d2f9 Mon Sep 17 00:00:00 2001
From 4588a03309c7ce7404f54e010f4a93656bf9ff47 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/104] s3:utils: Remove obsolete force encryption from
@ -4830,7 +4830,7 @@ index fea066ce468..4ceac7b3ab0 100644
2.29.2
From b897f3360dae5737d646dbce9f7571b1cfb070b0 Mon Sep 17 00:00:00 2001
From 23b759045448c9072f8342778ea36b721c481bfd 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/104] s3:rpcclient: Remove obsolete force encryption from
@ -4868,7 +4868,7 @@ index 2ead6cc7ba5..575a42ebf70 100644
2.29.2
From b01458095b5e815c09eb71fb597598e9f34ee342 Mon Sep 17 00:00:00 2001
From b42861ddc3b16cdda39c86d0549ed3af8e22cf7b 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/104] examples: Remove obsolete force encryption from
@ -4906,7 +4906,7 @@ index 6206c3a9701..c64be573462 100644
2.29.2
From 66eb5d32234f2e7700a43504158507a6f828c50b Mon Sep 17 00:00:00 2001
From 9718e834445fa9fb77a947aee35ff49f9ce98572 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/104] s3:libsmb: Make cli_cm_force_encryption_creds()
@ -4954,7 +4954,7 @@ index 850cf12c8a6..eeabcaa7463 100644
2.29.2
From 3b8e9646f0a79e2cbb977b8c1d0fc5f28a9b7490 Mon Sep 17 00:00:00 2001
From 7e0b354aca307a2eaf45dcf0ca2e1203e7784fd3 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/104] s4:libcli: Return NTSTATUS errors for
@ -5054,7 +5054,7 @@ index 582d43ef173..ad50ae0ac81 100644
2.29.2
From cecd31a2451e20046c0202837269fb533e3118a7 Mon Sep 17 00:00:00 2001
From 667f1730533b589820c2c7c492000fb86445797a 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/104] s4:libcli: Return if encryption is requested for SMB1
@ -5091,7 +5091,7 @@ index 6ee4929e8d7..51e121bdce6 100644
2.29.2
From ed5b2f36fec30ae7b277620cb82f01a07f027e0e Mon Sep 17 00:00:00 2001
From 97ce0f36abf29c234fbc4d8846ce0b68b2e4a6ab 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/104] s3:libcli: Split out smb2_connect_tcon_start()
@ -5144,7 +5144,7 @@ index 6fc3993a4e8..95ff05eac8f 100644
2.29.2
From 7eb81b6448064d8beee3972471723b90ea9307ec Mon Sep 17 00:00:00 2001
From bf357c3c06df5ac5aeea7851a7e285d68f3ab974 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/104] s4:libcli: Add smb2_connect_enc_start()
@ -5215,7 +5215,7 @@ index 95ff05eac8f..3a3ecdf20e8 100644
2.29.2
From b5b0c28d597d8ef98b632e4616d2d2cdaaad37a9 Mon Sep 17 00:00:00 2001
From 5a984891f73b07211d64e5a2f262915386aea7f4 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/104] s4:libcli: Require signing for SMB encryption
@ -5271,7 +5271,7 @@ index 3a3ecdf20e8..9540704491e 100644
2.29.2
From ee95e01cdc3917fc371b3145dcbe6d23ffc054b1 Mon Sep 17 00:00:00 2001
From b733749b324891e6352fbb9ef51fa0452baa313e 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/104] python:tests: Add test for SMB encrypted DCERPC
@ -5392,7 +5392,7 @@ index 20981754db4..adcb5b53189 100644
2.29.2
From fefa1d0236c67b2a93328eb9e0eac21da22235b2 Mon Sep 17 00:00:00 2001
From 141c2ebfb18be8ca2b313e900539cfa6b5927ded 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/104] auth:gensec: Add gensec_security_sasl_names()
@ -5522,7 +5522,7 @@ index d2d62d6652e..4eb45643714 100644
2.29.2
From adf58a175cea99c0b0147d3b3275563c7155edfa Mon Sep 17 00:00:00 2001
From b68a26966dddb4ec8a7bc7ec3441dbf03efd6af9 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/104] s4:ldap_server: Use samba_server_gensec_start() in
@ -5634,7 +5634,7 @@ index 2839082daef..915d9b94f9b 100644
2.29.2
From e887d94b47aca3609fd158efe0f4654101c5e02b Mon Sep 17 00:00:00 2001
From fa5761777851f6d2ecdaa88fdea3260e42dc634c 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/104] auth:gensec: Make gensec_use_kerberos_mechs() a
@ -5684,7 +5684,7 @@ index 4eb45643714..ebcab76999a 100644
2.29.2
From 08dc4775dbf72a1e8068d392360be158d8305bfa Mon Sep 17 00:00:00 2001
From 3c052ba053b6fee6c97f13aca8eafe680321ded8 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/104] auth:gensec: Pass use_kerberos and keep_schannel to
@ -5758,7 +5758,7 @@ index ebcab76999a..8d1b41fec74 100644
2.29.2
From bc505a449449267085778ec51c5362e256837edb Mon Sep 17 00:00:00 2001
From ec9c5e93a31763c48d5c2d0e8859d9750aa36ed1 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/104] auth:gensec: If Kerberos is required, keep schannel
@ -5795,7 +5795,7 @@ index 8d1b41fec74..3f42d611140 100644
2.29.2
From 9b7a189e038e3f783a2b23302f0ee4657ef18057 Mon Sep 17 00:00:00 2001
From d3f6c14e95159b4fed2034d563479607b48ee9ea 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/104] auth:creds: Add cli_credentials_init_server()
@ -5861,7 +5861,7 @@ index 7d0cf53194b..438bcdce232 100644
2.29.2
From 013d5eb87f3ddcda6df5c76796bede7a85c42207 Mon Sep 17 00:00:00 2001
From b6249e4af652be9f02741ed0de59889734bff13f 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/104] s4:rpc_server: Use cli_credentials_init_server()
@ -5909,7 +5909,7 @@ index 084857a44bf..e64148ef788 100644
2.29.2
From 6e6030dca006e829150e6b64db0485e3c9895485 Mon Sep 17 00:00:00 2001
From b0db24f086aad67ca9e536c6c94ef413983b5586 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/104] s4:smb_server: Use cli_credentials_init_server() for
@ -6009,7 +6009,7 @@ index 4aaaf46793b..c433eb194bd 100644
2.29.2
From f9f25b7690c2e234ea2e631f05c1fb0180776842 Mon Sep 17 00:00:00 2001
From 96aae2c7cf11aeaadc98e0e18f88d1c9387019a7 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/104] selftest: Rename 'smb encrypt' to 'server smb
@ -6060,7 +6060,7 @@ index e141f102ef1..c070086ca49 100755
2.29.2
From 2fc16a8d11f48424fc2fff0380fb623f552ece5f Mon Sep 17 00:00:00 2001
From f4d1c495b4eb8a3125812e1d1d81639afdd15c06 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/104] selftest: Move enc_desired to provision to have it in
@ -6107,7 +6107,7 @@ index c070086ca49..fa3ca8962a5 100755
2.29.2
From 299d7d6868e9590693e465cbc0c10abe8b7fc5a0 Mon Sep 17 00:00:00 2001
From c69630ece0849fdca724003600f1b39d6411e194 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/104] s3:tests: Add smbclient tests for 'client smb
@ -6248,7 +6248,7 @@ index 27dc7587b17..46bf274227c 100755
2.29.2
From d996ccf7dc53046f92827ddab72aac6e92dd3a77 Mon Sep 17 00:00:00 2001
From 5b15d0dd8783b8431e3d3913ee129b6e0f111de7 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/104] s3:client: Remove global smb_encrypt
@ -6356,7 +6356,7 @@ index 56309efcea7..60d4fb3c5ee 100644
2.29.2
From b923ea7625de03e23a999a3cb844d81dcd25316f Mon Sep 17 00:00:00 2001
From 1c461fb323ba59539c8dab2547032bdb48c60178 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/104] s3:libsmb: Remove force_encrypt from cli_cm_open()
@ -6510,7 +6510,7 @@ index eeabcaa7463..bb3e9e6874e 100644
2.29.2
From 2fd26f4c208556cd2f28f0c54fe11cea044c7881 Mon Sep 17 00:00:00 2001
From 411587b7301ec115398e430bcac16c5a22bdfe41 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/104] s3:libsmb: Remove force_encrypt from cli_cm_connect()
@ -6572,7 +6572,7 @@ index 4825b8f3fae..b0032005398 100644
2.29.2
From 3db1056dc42765aa3043b6ea0fd0389a34a41145 Mon Sep 17 00:00:00 2001
From af532caa1ba9727663abf17465b04768c6f7173e 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/104] s3:libsmb: Remove force_encrypt from clidfs
@ -6633,7 +6633,7 @@ index b0032005398..5503506de97 100644
2.29.2
From 8b234932ec76052258078d08071c33fefd5f3a0e Mon Sep 17 00:00:00 2001
From 918aa81d36bcd8b28fa98deadd811b8602fb3f6d 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/104] s3:libsmb: Remove force_encrypt from
@ -6730,7 +6730,7 @@ index bb3e9e6874e..f2b0a8c5ff8 100644
2.29.2
From b1324ba3361e66ca4bdf5b0cb0e1d8c8084955d4 Mon Sep 17 00:00:00 2001
From 00bba24fda3f117eced7f306d5d4019f14595d38 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/104] s3:libsmb: Pass cli_credentials to clidfs
@ -6849,7 +6849,7 @@ index 736c565a7a8..d536e0597af 100644
2.29.2
From 5997be2fc0d9b25c7a81d1d21e3cc1cd3f55e66f Mon Sep 17 00:00:00 2001
From 0dfe1d347c131b66172d324a5a16336875b24d50 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/104] s3:libsmb: Pass cli_credentials to cli_cm_connect()
@ -6920,7 +6920,7 @@ index d536e0597af..a2c6f5fe5ec 100644
2.29.2
From 62109132050092a5b4ac81d80cb358e563da605c Mon Sep 17 00:00:00 2001
From baf5499376658651aa03ba864e6541e2daf06b3a 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/104] s3:libsmb: Pass cli_credentials to cli_cm_open()
@ -7131,7 +7131,7 @@ index f2b0a8c5ff8..0b8cf2a6036 100644
2.29.2
From 9500031d977b874b32085df3ff7f5b0ae28514c6 Mon Sep 17 00:00:00 2001
From ee496daf60a5340ab9e4f16430e2d93fd121659b 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/104] s3:libsmb: Pass cli_credentials to
@ -8018,7 +8018,7 @@ index 8fd9fcc5780..4989ec633c3 100644
2.29.2
From e3ce5ba85266a08bd201c851e8fd59b71322d03e Mon Sep 17 00:00:00 2001
From aa21292bdc66f8f26244da5f1422bc41afafa6f7 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/104] s3:client: Remove global max_protocol
@ -8100,7 +8100,7 @@ index 13e48f80a01..902cdec8b64 100644
2.29.2
From 156a763a247480a88ab79f8822a2f34670a0c63b Mon Sep 17 00:00:00 2001
From 517baf60c6597388cfd1a17bf998272586d3bfc9 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/104] s3:libsmb: Remove max_protocol from cli_cm_open()
@ -8225,7 +8225,7 @@ index 517738dbcd7..8aaaff2cb1e 100644
2.29.2
From 2ad30b082df42e010ca88e7a84471629476e00b9 Mon Sep 17 00:00:00 2001
From b35001a76bc0ff7fc10bd319abfda481b8a81c9b 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/104] s3:libcmb: Remove max_protocol from cli_cm_connect()
@ -8278,7 +8278,7 @@ index fb1a0c72e6d..023dd4d2757 100644
2.29.2
From 4cc3243a8cf7c18129ad41ea52abc325aef55f06 Mon Sep 17 00:00:00 2001
From 4e405a5acc748c07f74a27ed57deeffc4e2c20d7 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/104] s3:libsmb: Remove max_protocol from clidfs
@ -8341,7 +8341,7 @@ index 023dd4d2757..ee5becf76a6 100644
2.29.2
From bfd80fa8f7a476b2fb37bd435697700ad032cc70 Mon Sep 17 00:00:00 2001
From c710bcf3600beb7f9a08c56108c0c93f32a9139b 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/104] s3:include: Move loadparm prototypes to own header
@ -8759,7 +8759,7 @@ index 00000000000..7686877ccf1
2.29.2
From ad73140f7e08472179ac7598cfea780a207f0570 Mon Sep 17 00:00:00 2001
From 62a13e686241e752ba927da046dda68324f3a550 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/104] s3:lib: Move interface prototypes to own header file
@ -8865,7 +8865,7 @@ index 00000000000..f45435b4a81
2.29.2
From bd958477d69c820766a30f818163cda9f9d171a3 Mon Sep 17 00:00:00 2001
From 2b704c32b55432d08eae3cae2267a4b6319c6c6c 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/104] idl: Add SID_SAMBA_SMB3
@ -8895,7 +8895,7 @@ index a92e8f1518e..06bf7449a70 100644
2.29.2
From 6b4e237ea0900e2ac7f46b889fd95d1d04db5bff Mon Sep 17 00:00:00 2001
From ae4b1eccc9ef043a753126f942345a57a92004ed 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/104] s3:smbd: Add SMB3 connection information to session
@ -9052,7 +9052,7 @@ index cf9de185c1f..cd24b7d2ed5 100644
2.29.2
From 466c2d98005e1e0a3c3aa7b17779031b426b5da6 Mon Sep 17 00:00:00 2001
From 49853bdabadcde29032b0ae09f015a0adf3cd22c 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/104] librpc: Add dcerpc helper
@ -9268,7 +9268,7 @@ index 27b180fa63d..109a1834841 100644
2.29.2
From cc8a5479152c6131362e9ca9cfe6e5bab2a71af3 Mon Sep 17 00:00:00 2001
From 0490f135fdcc293561b0af98b4ce0f4d56eb14a6 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/104] s3:smbd: Use defines to set 'srv_smb_encrypt'
@ -9305,7 +9305,7 @@ index d51a3de9497..785cbb23b5f 100644
2.29.2
From dad6dc0e5a202d48a930504768394343823d5c42 Mon Sep 17 00:00:00 2001
From bbbb58dd5f37f82b46872d4a9eb3c6f6c1939a26 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/104] s3:rpc_server: Allow to use RC4 for setting passwords
@ -9542,7 +9542,7 @@ index 2af02ad6fa8..eb91ac09384 100644
2.29.2
From 2932bdeff6ad18a36b2b64ab59d72ff1040acd09 Mon Sep 17 00:00:00 2001
From c3ffe2ce09c761a69ba83ae55beb4af4e53095d7 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/104] s4:rpc_server: Allow to use RC4 for setting passwords
@ -9673,7 +9673,7 @@ index de55ad6239a..c9c1978f223 100644
2.29.2
From 959978865400d20fe1b2f9b5343fbec7c0b1109a Mon Sep 17 00:00:00 2001
From 6163af4d52811d487fa3568d0588e6afd7f43167 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/104] lib:crypto: Add py binding for set_relax/strict fips
@ -9731,7 +9731,7 @@ index 32b946eee8f..ad18d3ada0f 100644
2.29.2
From e3059d24a83175efb4f9eb3844c2e02d2af7775a Mon Sep 17 00:00:00 2001
From 0dbd9d87a529585cabd793ae4c2bc1d94044c619 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/104] s4:param: Add 'weak crypto' getter to pyparam
@ -9787,7 +9787,7 @@ index 4023fac4dd6..e15592b5743 100644
2.29.2
From 2c10e3c1bbd7527f8563dca42700310c86ec04d4 Mon Sep 17 00:00:00 2001
From 29e334546e28b10ff31f0de453951648c4e51296 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/104] python:tests: Add SAMR password change tests for fips
@ -10012,7 +10012,7 @@ index adcb5b53189..86cab3f8046 100644
2.29.2
From 65f6aef76ebc4b432f2743fb36cec64d7e06e71d Mon Sep 17 00:00:00 2001
From de2b1caebf0183bd24d06969ebf7d03223f7d9fc 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/104] python:tests: Add SAMR password change tests for fips
@ -10045,7 +10045,7 @@ index 649e923ff9a..1ebdf2a5484 100755
2.29.2
From 114ce58de5ac14035c095e12aeb31931c7859d89 Mon Sep 17 00:00:00 2001
From 5f240ac738df737712cbc2cdd40c8a56ab9e165b 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/104] auth:creds: Rename CRED_USE_KERBEROS values
@ -10787,7 +10787,7 @@ index 07c6faebb15..701dfc10a07 100644
2.29.2
From dd116a6a1b334431981b786c103503d9e2998247 Mon Sep 17 00:00:00 2001
From 03fb4e57548098264386dfd056f37ad2c86a937a 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/104] auth:creds:tests: Migrate test to a cmocka unit test
@ -11084,7 +11084,7 @@ index 38b6c8f4b6e..f0ab0357986 100644
2.29.2
From 48c31546ad4c2a072497e3ce9eff37ef37bc81c8 Mon Sep 17 00:00:00 2001
From 82565bd73ee76d51b6569743644be1b916461acd 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/104] Add smb2cli_session_get_encryption_cipher()
@ -11102,10 +11102,10 @@ Reviewed-by: Alexander Bokovoy <ab@samba.org>
2 files changed, 14 insertions(+)
diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c
index 7d2da4b9ebc..471319a32f1 100644
index 4909797543c..1be3a5506a0 100644
--- a/libcli/smb/smbXcli_base.c
+++ b/libcli/smb/smbXcli_base.c
@@ -6436,6 +6436,19 @@ NTSTATUS smb2cli_session_encryption_on(struct smbXcli_session *session)
@@ -6461,6 +6461,19 @@ NTSTATUS smb2cli_session_encryption_on(struct smbXcli_session *session)
return NT_STATUS_OK;
}
@ -11141,7 +11141,7 @@ index 2afc7165cd9..db5f5d58799 100644
2.29.2
From 25a7d3534f7e3798cdf2432de62ed62f9e11547b Mon Sep 17 00:00:00 2001
From f74c5cc57398ee42fecdfda17f4d442ca1abd9a5 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/104] Add dcerpc_transport_encrypted()
@ -11233,7 +11233,7 @@ index bd79a072bc8..6ea27a8d9a3 100644
2.29.2
From a0b8ea04d7030d2cb97d6ccea9d28072d6e3dbda Mon Sep 17 00:00:00 2001
From 89a12dbf4a5b819dbd136e743c59025298009049 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/104] Add py binding for dcerpc_transport_encrypted
@ -11280,7 +11280,7 @@ index be914ed5f14..309a6d72e26 100644
2.29.2
From ff38da1d43f7ec3312a90fb8c53f977c9466e199 Mon Sep 17 00:00:00 2001
From a08aab47494ab4f2972de3ebe4b022a1d23216a5 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/104] selftest: add a test for py dce transport_encrypted
@ -11345,7 +11345,7 @@ index 8e0d6a5ef0a..24e4ac77d89 100644
2.29.2
From 5ffb0a0d9093bba2c4630d89512f623a35122f8e Mon Sep 17 00:00:00 2001
From 4e8f7954ceed5a14987eb56197f265618fd77acc 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/104] Add CreateTrustedDomainRelax wrapper for fips mode
@ -11431,7 +11431,7 @@ index 00000000000..b4df0fa5bb8
2.29.2
From d980bb1444e318825457ead9bdbce1c9353ccc66 Mon Sep 17 00:00:00 2001
From 2e16b3d7d5419e76d33b2c3a794a043be5c0a4a5 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/104] Use the new CreateTrustedDomainRelax()
@ -11538,7 +11538,7 @@ index 1d12c362911..93a3258d28d 100644
2.29.2
From e06d01fe3370501ab45d01c5511aa0b5de9d854e Mon Sep 17 00:00:00 2001
From 2661a29e81b6b33dce6ca1e39c9e4eeaab53fef7 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/104] selftest: add a test for the CreateTrustedDomainRelax
@ -11723,7 +11723,7 @@ index 3a903a7eee0..96f51b68cfc 100755
2.29.2
From 93b792d5d0dcf96833e32958aeb3877f74125f07 Mon Sep 17 00:00:00 2001
From 3d3a03764d56b58a81ef99123720bd5555eaf040 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/104] Remove source4/scripting/devel/createtrust script
@ -11878,7 +11878,7 @@ index 26b0d0dcb68..00000000000
2.29.2
From 4577786be36993e958b745e4953f582e3de301a1 Mon Sep 17 00:00:00 2001
From 8bdfdf2b2489393586dbc99b1d2282c61acdce09 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/104] s3:rpc_server: Use gnutls_cipher_decrypt() in
@ -11910,7 +11910,7 @@ index 198387424e6..e749caf2551 100644
2.29.2
From ad9c90d18c2efdee16535ade97d4b151e4a64c5e Mon Sep 17 00:00:00 2001
From 37fce305caff75a8ee1ab185f37e984809225239 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/104] s4:rpc_server: Use gnutls_cipher_decrypt() in
@ -11942,7 +11942,7 @@ index 8333cb149b6..4bb8aaa9592 100644
2.29.2
From 6c73bf8553c48e28abd09ff225cbfb8278528d0d Mon Sep 17 00:00:00 2001
From caf59e243ed0f99056176ef81fe617b170ec6cfd 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/104] s3:rpc_server: Allow to use RC4 for creating trusts
@ -12009,7 +12009,7 @@ index e749caf2551..d6d606ddeca 100644
2.29.2
From 20f0e078f2dd5681513253788216313851df428d Mon Sep 17 00:00:00 2001
From 14b972e7f4224ccf87b1d08824194a4d7d37aef0 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/104] s4:rpc_server: Allow to use RC4 for creating trusts
@ -12081,7 +12081,7 @@ index 4bb8aaa9592..5b3ef71d458 100644
2.29.2
From 8c7a60700f7c7925749ccfd0f3ccb17ca47df7da Mon Sep 17 00:00:00 2001
From 5fdca81ab920d021e5f1c81a05cf3a91244ef405 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/104] sefltest: Enable the dcerpc.createtrustrelax test
@ -12111,7 +12111,7 @@ index 80effda8343..00000000000
2.29.2
From 9db0e9602ea96849a6f854415f4cd988576cccf2 Mon Sep 17 00:00:00 2001
From 2547b1d495afa0f7235064f4949a297e46338287 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/104] s3:smbd: Fix possible null pointer dereference in
@ -12147,7 +12147,7 @@ index 57754a0f766..694c0c290e8 100644
2.29.2
From b92cbd97865ea6ef49892df75c59f37e9917ddb3 Mon Sep 17 00:00:00 2001
From 14cba0db4c3e8a20923491f01cd6eb658c8d76ae 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/104] lookup_name: allow lookup names prefixed with DNS
@ -12257,7 +12257,7 @@ index 82c47b3145b..864246da56e 100644
2.29.2
From 5bf01d45325bcc6819f807620267e35841f826a3 Mon Sep 17 00:00:00 2001
From 35297bdac5cf9699234ec45ae97e54ceec75ebe9 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/104] auth_sam: use pdb_get_domain_info to look up DNS
@ -12480,7 +12480,7 @@ index 3c12f959faf..e8e0d543f8c 100644
2.29.2
From edd405a3918b5d52e7eeff2f8425478a0a1867ed Mon Sep 17 00:00:00 2001
From 173cabf40d71470a233b7648b1bf8795f8bda091 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/104] docs-xml: Add a section about weak crypto in testparm

BIN
samba-pubkey_AA99442FB680B620.gpg Normal file
View File

Binary file not shown.

8
samba.spec
View File

@ -10,7 +10,7 @@
%define main_release 0
%define samba_version 4.13.3
%define samba_version 4.13.4
%define talloc_version 2.3.1
%define tdb_version 1.4.3
%define tevent_version 0.10.2
@ -120,7 +120,7 @@ URL: https://www.samba.org
# This is a xz recompressed file of https://ftp.samba.org/pub/samba/samba-%%{version}%%{pre_release}.tar.gz
Source0: https://ftp.samba.org/pub/samba/samba-%{version}%{pre_release}.tar.gz#/samba-%{version}%{pre_release}.tar.xz
Source1: https://ftp.samba.org/pub/samba/samba-%{version}%{pre_release}.tar.asc
Source2: gpgkey-52FBC0B86D954B0843324CDC6F33915B6568B7EA.gpg
Source2: samba-pubkey_AA99442FB680B620.gpg
# Red Hat specific replacement-files
Source10: samba.logrotate
@ -1537,7 +1537,6 @@ fi
%{_libdir}/samba/libsmb-transport-samba4.so
%{_libdir}/samba/libsmbclient-raw-samba4.so
%{_libdir}/samba/libsmbd-base-samba4.so
%{_libdir}/samba/libsmbd-conn-samba4.so
%{_libdir}/samba/libsmbd-shim-samba4.so
%{_libdir}/samba/libsmbldaphelper-samba4.so
%{_libdir}/samba/libsys-rw-samba4.so
@ -3628,6 +3627,9 @@ fi
%endif
%changelog
* Tue Jan 26 2021 Guenther Deschner <gdeschner@redhat.com> - 4.13.4-0
- Update to Samba 4.13.4
* Tue Dec 15 2020 Guenther Deschner <gdeschner@redhat.com> - 4.13.3-0
- Update to Samba 4.13.3

4
sources
View File

@ -1,2 +1,2 @@
SHA512 (samba-4.13.3.tar.xz) = 8dbd8a18ff8566f778b17c9a5306a0d3f45a79fc8d1ce7c2ea63f941eb1b310462f97f2bdd40c4e09c69e2aae3f5144e488cb20e1b6686695306b521d609b6dc
SHA512 (samba-4.13.3.tar.asc) = f5ef09ae3fa434b7c37564407ad3b62542d9abc7ca0e2a1e58ebb987307a5269c123b1af3755582edff7fdcfe2930a151d6256b97ab8dcd296492038a96a160a
SHA512 (samba-4.13.4.tar.xz) = c6fb8b4186da25c69d1bc662780a12c6fa6fa70fc65fa487dba2d547c96e8f7f8f8736b8edc2564b599be875b00d891631fa37838632efac593bf83eb33392f9
SHA512 (samba-4.13.4.tar.asc) = b8c0ccd7e716d2de6e9da2a53577bc31983eaec4ed4583bb88b52b2ca8b80045c8c0349a97a12e796df84a5942293f5a40e74eff8c003b3062f8f6454dc2a631