From 6c43234a06ba727b1ba4af8d0cbee06b5227c8c6 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 19 Sep 2024 06:39:02 +0200 Subject: [PATCH] s3:librpc/rpc: split out dcerpc_internal.h for struct pipe_auth_data This should be anonymous for callers. Signed-off-by: Stefan Metzmacher Reviewed-by: Ralph Boehme (cherry picked from commit b874619b5ed5d29a939f13d8064a47c8aca45b8c) --- source3/librpc/rpc/dcerpc.h | 13 +---------- source3/librpc/rpc/dcerpc_helpers.c | 1 + source3/librpc/rpc/dcerpc_internal.h | 35 ++++++++++++++++++++++++++++ source3/rpc_client/cli_pipe.c | 1 + 4 files changed, 38 insertions(+), 12 deletions(-) create mode 100644 source3/librpc/rpc/dcerpc_internal.h diff --git a/source3/librpc/rpc/dcerpc.h b/source3/librpc/rpc/dcerpc.h index fdd3beda46d..f3dc3394ff4 100644 --- a/source3/librpc/rpc/dcerpc.h +++ b/source3/librpc/rpc/dcerpc.h @@ -32,18 +32,7 @@ struct NL_AUTH_MESSAGE; struct gensec_security; - -/* auth state for all bind types. */ - -struct pipe_auth_data { - enum dcerpc_AuthType auth_type; - enum dcerpc_AuthLevel auth_level; - uint32_t auth_context_id; - bool hdr_signing; - bool verified_bitmask1; - - struct gensec_security *auth_ctx; -}; +struct pipe_auth_data; /* The following definitions come from librpc/rpc/dcerpc_helpers.c */ NTSTATUS dcerpc_push_ncacn_packet(TALLOC_CTX *mem_ctx, diff --git a/source3/librpc/rpc/dcerpc_helpers.c b/source3/librpc/rpc/dcerpc_helpers.c index 2b99eb7aff7..5310e4a6612 100644 --- a/source3/librpc/rpc/dcerpc_helpers.c +++ b/source3/librpc/rpc/dcerpc_helpers.c @@ -20,6 +20,7 @@ #include "includes.h" #include "librpc/rpc/dcerpc.h" +#include "librpc/rpc/dcerpc_internal.h" #include "librpc/rpc/dcerpc_util.h" #include "librpc/gen_ndr/ndr_dcerpc.h" #include "librpc/crypto/gse.h" diff --git a/source3/librpc/rpc/dcerpc_internal.h b/source3/librpc/rpc/dcerpc_internal.h new file mode 100644 index 00000000000..3c026fa2947 --- /dev/null +++ b/source3/librpc/rpc/dcerpc_internal.h @@ -0,0 +1,35 @@ +/* + Unix SMB/CIFS implementation. + + DCERPC client side interface structures + + Copyright (C) 2008 Jelmer Vernooij + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program. If not, see . +*/ + +#ifndef _S3_DCERPC_INTERNAL_H__ +#define _S3_DCERPC_INTERNAL_H__ + +struct pipe_auth_data { + enum dcerpc_AuthType auth_type; + enum dcerpc_AuthLevel auth_level; + uint32_t auth_context_id; + bool hdr_signing; + bool verified_bitmask1; + + struct gensec_security *auth_ctx; +}; + +#endif /* __S3_DCERPC_INTERNAL_H__ */ diff --git a/source3/rpc_client/cli_pipe.c b/source3/rpc_client/cli_pipe.c index 44e84dc6230..c1b7930fe9e 100644 --- a/source3/rpc_client/cli_pipe.c +++ b/source3/rpc_client/cli_pipe.c @@ -31,6 +31,7 @@ #include "librpc/gen_ndr/ndr_netlogon_c.h" #include "librpc/gen_ndr/auth.h" #include "librpc/rpc/dcerpc.h" +#include "librpc/rpc/dcerpc_internal.h" #include "librpc/rpc/dcerpc_util.h" #include "rpc_dce.h" #include "cli_pipe.h" -- 2.47.2