48 lines
1.7 KiB
Diff
48 lines
1.7 KiB
Diff
From 037606c112ae4d1025708d2d12898e73359f0c54 Mon Sep 17 00:00:00 2001
|
|
From: Samuel Cabrero <scabrero@suse.de>
|
|
Date: Wed, 4 Jan 2023 17:42:37 +0100
|
|
Subject: [PATCH 39/40] CVE-2022-38023 s3:rpc_server/netlogon: Rename variable
|
|
|
|
This will simplify the following changes.
|
|
|
|
Signed-off-by: Samuel Cabrero <scabrero@samba.org>
|
|
|
|
Conflict: NA
|
|
Reference: https://attachments.samba.org/attachment.cgi?id=17736
|
|
---
|
|
source3/rpc_server/netlogon/srv_netlog_nt.c | 6 +++---
|
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/source3/rpc_server/netlogon/srv_netlog_nt.c b/source3/rpc_server/netlogon/srv_netlog_nt.c
|
|
index 5f89e945f9c..f238d7ce42b 100644
|
|
--- a/source3/rpc_server/netlogon/srv_netlog_nt.c
|
|
+++ b/source3/rpc_server/netlogon/srv_netlog_nt.c
|
|
@@ -1082,7 +1082,7 @@ static NTSTATUS netr_check_schannel(struct pipes_struct *p,
|
|
unsigned int dbg_lvl = DBGLVL_DEBUG;
|
|
const char *opname = "<unknown>";
|
|
const char *reason = "<unknown>";
|
|
- static bool warned_global_once = false;
|
|
+ static bool warned_global_schannel_once = false;
|
|
|
|
if (opnum < ndr_table_netlogon.num_calls) {
|
|
opname = ndr_table_netlogon.calls[opnum].name;
|
|
@@ -1197,14 +1197,14 @@ static NTSTATUS netr_check_schannel(struct pipes_struct *p,
|
|
return status;
|
|
}
|
|
|
|
- if (!schannel_global_required && !warned_global_once) {
|
|
+ if (!schannel_global_required && !warned_global_schannel_once) {
|
|
/*
|
|
* We want admins to notice their misconfiguration!
|
|
*/
|
|
DBG_ERR("CVE-2020-1472(ZeroLogon): "
|
|
"Please configure 'server schannel = yes', "
|
|
"See https://bugzilla.samba.org/show_bug.cgi?id=14497\n");
|
|
- warned_global_once = true;
|
|
+ warned_global_schannel_once = true;
|
|
}
|
|
|
|
status = NT_STATUS_OK;
|
|
--
|
|
2.39.0
|