Attachment 17983 Details for Bug 15418 – WIP patch for master

[patch] WIP patch for master

WIP-master-bug154178.patch (text/plain), 2.25 KB, created by Ralph Böhme on 2023-07-14 08:22:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralph Böhme

Created: 2023-07-14 08:22:05 UTC

Size: 2.25 KB

patch

obsolete

>From af355243e55a4baf17126339eb66432d438c4f16 Mon Sep 17 00:00:00 2001
>From: Stefan Metzmacher <metze@samba.org>
>Date: Fri, 14 Jul 2023 10:20:05 +0200
>Subject: [PATCH] s3+s3/rpc_server: fix unsupported netr_LogonGetCapabilities
> level 2
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=15418
>---
> source3/rpc_server/netlogon/srv_netlog_nt.c   | 9 +++++----
> source4/rpc_server/netlogon/dcerpc_netlogon.c | 8 ++++----
> 2 files changed, 9 insertions(+), 8 deletions(-)
>
>diff --git a/source3/rpc_server/netlogon/srv_netlog_nt.c b/source3/rpc_server/netlogon/srv_netlog_nt.c
>index 3ba58e61206f..2018dc28eb67 100644
>--- a/source3/rpc_server/netlogon/srv_netlog_nt.c
>+++ b/source3/rpc_server/netlogon/srv_netlog_nt.c
>@@ -2284,6 +2284,11 @@ NTSTATUS _netr_LogonGetCapabilities(struct pipes_struct *p,
> 	struct netlogon_creds_CredentialState *creds;
> 	NTSTATUS status;
> 
>+	if (r->in.query_level != 1) {
>+		p->fault_state = DCERPC_NCA_S_FAULT_INVALID_TAG;
>+		return NT_STATUS_NOT_SUPPORTED;
>+	}
>+
> 	become_root();
> 	status = dcesrv_netr_creds_server_step_check(p->dce_call,
> 						p->mem_ctx,
>@@ -2296,10 +2301,6 @@ NTSTATUS _netr_LogonGetCapabilities(struct pipes_struct *p,
> 		return status;
> 	}
> 
>-	if (r->in.query_level != 1) {
>-		return NT_STATUS_NOT_SUPPORTED;
>-	}
>-
> 	r->out.capabilities->server_capabilities = creds->negotiate_flags;
> 
> 	return NT_STATUS_OK;
>diff --git a/source4/rpc_server/netlogon/dcerpc_netlogon.c b/source4/rpc_server/netlogon/dcerpc_netlogon.c
>index 6ccba65d3bf0..c869a6d3c791 100644
>--- a/source4/rpc_server/netlogon/dcerpc_netlogon.c
>+++ b/source4/rpc_server/netlogon/dcerpc_netlogon.c
>@@ -2364,6 +2364,10 @@ static NTSTATUS dcesrv_netr_LogonGetCapabilities(struct dcesrv_call_state *dce_c
> 	struct netlogon_creds_CredentialState *creds;
> 	NTSTATUS status;
> 
>+	if (r->in.query_level != 1) {
>+		DCESRV_FAULT(DCERPC_NCA_S_FAULT_INVALID_TAG);
>+	}
>+
> 	status = dcesrv_netr_creds_server_step_check(dce_call,
> 						     mem_ctx,
> 						     r->in.computer_name,
>@@ -2375,10 +2379,6 @@ static NTSTATUS dcesrv_netr_LogonGetCapabilities(struct dcesrv_call_state *dce_c
> 	}
> 	NT_STATUS_NOT_OK_RETURN(status);
> 
>-	if (r->in.query_level != 1) {
>-		return NT_STATUS_NOT_SUPPORTED;
>-	}
>-
> 	r->out.capabilities->server_capabilities = creds->negotiate_flags;
> 
> 	return NT_STATUS_OK;
>-- 
>2.41.0
>

Actions: View

Attachments on bug 15418: 17979 | 17983 | 17985 | 17986 | 17987