b6b438
From f719db12774d7b22b818adb56c2abd64ab036caf Mon Sep 17 00:00:00 2001
b6b438
From: Andreas Schneider <asn@samba.org>
b6b438
Date: Thu, 11 Apr 2019 16:06:14 +0200
b6b438
Subject: [PATCH 201/208] s3:rpc_server: Only announce RC4 in netlogon server
b6b438
 if available
b6b438
b6b438
Signed-off-by: Andreas Schneider <asn@samba.org>
b6b438
---
b6b438
 source3/rpc_server/netlogon/srv_netlog_nt.c | 5 ++++-
b6b438
 1 file changed, 4 insertions(+), 1 deletion(-)
b6b438
b6b438
diff --git a/source3/rpc_server/netlogon/srv_netlog_nt.c b/source3/rpc_server/netlogon/srv_netlog_nt.c
b6b438
index cbbf9feedc7..3dd8ecf5ca8 100644
b6b438
--- a/source3/rpc_server/netlogon/srv_netlog_nt.c
b6b438
+++ b/source3/rpc_server/netlogon/srv_netlog_nt.c
b6b438
@@ -909,7 +909,6 @@ NTSTATUS _netr_ServerAuthenticate3(struct pipes_struct *p,
b6b438
 	/* 0x000001ff */
b6b438
 	srv_flgs = NETLOGON_NEG_ACCOUNT_LOCKOUT |
b6b438
 		   NETLOGON_NEG_PERSISTENT_SAMREPL |
b6b438
-		   NETLOGON_NEG_ARCFOUR |
b6b438
 		   NETLOGON_NEG_PROMOTION_COUNT |
b6b438
 		   NETLOGON_NEG_CHANGELOG_BDC |
b6b438
 		   NETLOGON_NEG_FULL_SYNC_REPL |
b6b438
@@ -918,6 +917,10 @@ NTSTATUS _netr_ServerAuthenticate3(struct pipes_struct *p,
b6b438
 		   NETLOGON_NEG_PASSWORD_CHANGE_REFUSAL |
b6b438
 		   NETLOGON_NEG_PASSWORD_SET2;
b6b438
 
b6b438
+	if (lp_weak_crypto() == SAMBA_WEAK_CRYPTO_ALLOWED) {
b6b438
+		srv_flgs |= NETLOGON_NEG_ARCFOUR;
b6b438
+	}
b6b438
+
b6b438
 	/* Ensure we support strong (128-bit) keys. */
b6b438
 	if (in_neg_flags & NETLOGON_NEG_STRONG_KEYS) {
b6b438
 		srv_flgs |= NETLOGON_NEG_STRONG_KEYS;
b6b438
-- 
b6b438
2.23.0
b6b438