From 72c1fe00811d76c2adf486133df6ec738b5c703e Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sun, 13 Mar 2011 18:57:43 +0100 Subject: [PATCH] librpc/rpc: move DCERPC_ flags to rpc_common.h metze Autobuild-User: Stefan Metzmacher Autobuild-Date: Sun Mar 13 20:45:53 CET 2011 on sn-devel-104 --- librpc/rpc/rpc_common.h | 54 +++++++++++++++++++++++++++++++++++++ source3/librpc/rpc/dcerpc.h | 54 ------------------------------------- source4/librpc/rpc/dcerpc.h | 54 ------------------------------------- 3 files changed, 54 insertions(+), 108 deletions(-) diff --git a/librpc/rpc/rpc_common.h b/librpc/rpc/rpc_common.h index bd9c46dab47..fae303f630e 100644 --- a/librpc/rpc/rpc_common.h +++ b/librpc/rpc/rpc_common.h @@ -52,6 +52,60 @@ struct dcerpc_binding { uint32_t assoc_group_id; }; +/* dcerpc pipe flags */ +#define DCERPC_DEBUG_PRINT_IN (1<<0) +#define DCERPC_DEBUG_PRINT_OUT (1<<1) +#define DCERPC_DEBUG_PRINT_BOTH (DCERPC_DEBUG_PRINT_IN | DCERPC_DEBUG_PRINT_OUT) + +#define DCERPC_DEBUG_VALIDATE_IN (1<<2) +#define DCERPC_DEBUG_VALIDATE_OUT (1<<3) +#define DCERPC_DEBUG_VALIDATE_BOTH (DCERPC_DEBUG_VALIDATE_IN | DCERPC_DEBUG_VALIDATE_OUT) + +#define DCERPC_CONNECT (1<<4) +#define DCERPC_SIGN (1<<5) +#define DCERPC_SEAL (1<<6) + +#define DCERPC_PUSH_BIGENDIAN (1<<7) +#define DCERPC_PULL_BIGENDIAN (1<<8) + +#define DCERPC_SCHANNEL (1<<9) + +#define DCERPC_ANON_FALLBACK (1<<10) + +/* use a 128 bit session key */ +#define DCERPC_SCHANNEL_128 (1<<12) + +/* check incoming pad bytes */ +#define DCERPC_DEBUG_PAD_CHECK (1<<13) + +/* set LIBNDR_FLAG_REF_ALLOC flag when decoding NDR */ +#define DCERPC_NDR_REF_ALLOC (1<<14) + +#define DCERPC_AUTH_OPTIONS (DCERPC_SEAL|DCERPC_SIGN|DCERPC_SCHANNEL|DCERPC_AUTH_SPNEGO|DCERPC_AUTH_KRB5|DCERPC_AUTH_NTLM) + +/* select spnego auth */ +#define DCERPC_AUTH_SPNEGO (1<<15) + +/* select krb5 auth */ +#define DCERPC_AUTH_KRB5 (1<<16) + +#define DCERPC_SMB2 (1<<17) + +/* select NTLM auth */ +#define DCERPC_AUTH_NTLM (1<<18) + +/* this triggers the DCERPC_PFC_FLAG_CONC_MPX flag in the bind request */ +#define DCERPC_CONCURRENT_MULTIPLEX (1<<19) + +/* this triggers the DCERPC_PFC_FLAG_SUPPORT_HEADER_SIGN flag in the bind request */ +#define DCERPC_HEADER_SIGNING (1<<20) + +/* use NDR64 transport */ +#define DCERPC_NDR64 (1<<21) + +/* specify binding interface */ +#define DCERPC_LOCALADDRESS (1<<22) + /* The following definitions come from ../librpc/rpc/dcerpc_error.c */ const char *dcerpc_errstr(TALLOC_CTX *mem_ctx, uint32_t fault_code); diff --git a/source3/librpc/rpc/dcerpc.h b/source3/librpc/rpc/dcerpc.h index 79e47c0ef20..a6e3e080920 100644 --- a/source3/librpc/rpc/dcerpc.h +++ b/source3/librpc/rpc/dcerpc.h @@ -30,60 +30,6 @@ #define SMB_RPC_INTERFACE_VERSION 1 -/* dcerpc pipe flags */ -#define DCERPC_DEBUG_PRINT_IN (1<<0) -#define DCERPC_DEBUG_PRINT_OUT (1<<1) -#define DCERPC_DEBUG_PRINT_BOTH (DCERPC_DEBUG_PRINT_IN | DCERPC_DEBUG_PRINT_OUT) - -#define DCERPC_DEBUG_VALIDATE_IN (1<<2) -#define DCERPC_DEBUG_VALIDATE_OUT (1<<3) -#define DCERPC_DEBUG_VALIDATE_BOTH (DCERPC_DEBUG_VALIDATE_IN | DCERPC_DEBUG_VALIDATE_OUT) - -#define DCERPC_CONNECT (1<<4) -#define DCERPC_SIGN (1<<5) -#define DCERPC_SEAL (1<<6) - -#define DCERPC_PUSH_BIGENDIAN (1<<7) -#define DCERPC_PULL_BIGENDIAN (1<<8) - -#define DCERPC_SCHANNEL (1<<9) - -#define DCERPC_ANON_FALLBACK (1<<10) - -/* use a 128 bit session key */ -#define DCERPC_SCHANNEL_128 (1<<12) - -/* check incoming pad bytes */ -#define DCERPC_DEBUG_PAD_CHECK (1<<13) - -/* set LIBNDR_FLAG_REF_ALLOC flag when decoding NDR */ -#define DCERPC_NDR_REF_ALLOC (1<<14) - -#define DCERPC_AUTH_OPTIONS (DCERPC_SEAL|DCERPC_SIGN|DCERPC_SCHANNEL|DCERPC_AUTH_SPNEGO|DCERPC_AUTH_KRB5|DCERPC_AUTH_NTLM) - -/* select spnego auth */ -#define DCERPC_AUTH_SPNEGO (1<<15) - -/* select krb5 auth */ -#define DCERPC_AUTH_KRB5 (1<<16) - -#define DCERPC_SMB2 (1<<17) - -/* select NTLM auth */ -#define DCERPC_AUTH_NTLM (1<<18) - -/* this triggers the DCERPC_PFC_FLAG_CONC_MPX flag in the bind request */ -#define DCERPC_CONCURRENT_MULTIPLEX (1<<19) - -/* this triggers the DCERPC_PFC_FLAG_SUPPORT_HEADER_SIGN flag in the bind request */ -#define DCERPC_HEADER_SIGNING (1<<20) - -/* use NDR64 transport */ -#define DCERPC_NDR64 (1<<21) - -/* specify binding interface */ -#define DCERPC_LOCALADDRESS (1<<22) - /* The following definitions come from librpc/rpc/binding.c */ struct epm_floor; diff --git a/source4/librpc/rpc/dcerpc.h b/source4/librpc/rpc/dcerpc.h index 22f4b1e5941..0a85f24d7bc 100644 --- a/source4/librpc/rpc/dcerpc.h +++ b/source4/librpc/rpc/dcerpc.h @@ -127,60 +127,6 @@ struct dcerpc_pipe { #define DCERPC_REQUEST_TIMEOUT 60 -/* dcerpc pipe flags */ -#define DCERPC_DEBUG_PRINT_IN (1<<0) -#define DCERPC_DEBUG_PRINT_OUT (1<<1) -#define DCERPC_DEBUG_PRINT_BOTH (DCERPC_DEBUG_PRINT_IN | DCERPC_DEBUG_PRINT_OUT) - -#define DCERPC_DEBUG_VALIDATE_IN (1<<2) -#define DCERPC_DEBUG_VALIDATE_OUT (1<<3) -#define DCERPC_DEBUG_VALIDATE_BOTH (DCERPC_DEBUG_VALIDATE_IN | DCERPC_DEBUG_VALIDATE_OUT) - -#define DCERPC_CONNECT (1<<4) -#define DCERPC_SIGN (1<<5) -#define DCERPC_SEAL (1<<6) - -#define DCERPC_PUSH_BIGENDIAN (1<<7) -#define DCERPC_PULL_BIGENDIAN (1<<8) - -#define DCERPC_SCHANNEL (1<<9) - -#define DCERPC_ANON_FALLBACK (1<<10) - -/* use a 128 bit session key */ -#define DCERPC_SCHANNEL_128 (1<<12) - -/* check incoming pad bytes */ -#define DCERPC_DEBUG_PAD_CHECK (1<<13) - -/* set LIBNDR_FLAG_REF_ALLOC flag when decoding NDR */ -#define DCERPC_NDR_REF_ALLOC (1<<14) - -#define DCERPC_AUTH_OPTIONS (DCERPC_SEAL|DCERPC_SIGN|DCERPC_SCHANNEL|DCERPC_AUTH_SPNEGO|DCERPC_AUTH_KRB5|DCERPC_AUTH_NTLM) - -/* select spnego auth */ -#define DCERPC_AUTH_SPNEGO (1<<15) - -/* select krb5 auth */ -#define DCERPC_AUTH_KRB5 (1<<16) - -#define DCERPC_SMB2 (1<<17) - -/* select NTLM auth */ -#define DCERPC_AUTH_NTLM (1<<18) - -/* this triggers the DCERPC_PFC_FLAG_CONC_MPX flag in the bind request */ -#define DCERPC_CONCURRENT_MULTIPLEX (1<<19) - -/* this triggers the DCERPC_PFC_FLAG_SUPPORT_HEADER_SIGN flag in the bind request */ -#define DCERPC_HEADER_SIGNING (1<<20) - -/* use NDR64 transport */ -#define DCERPC_NDR64 (1<<21) - -/* specify binding interface */ -#define DCERPC_LOCALADDRESS (1<<22) - struct dcerpc_pipe_connect { struct dcerpc_pipe *pipe; struct dcerpc_binding *binding; -- 2.34.1