From 25bb00fbcd409572e1c19c05fdc42c883936780b Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 3 Jan 2006 13:41:17 +0000 Subject: r12693: Move core data structures out of smb.h into core.h torture prototypes in seperate header (This used to be commit 73610639b23ca3743077193fa0b1de7c7f65944d) --- source4/librpc/config.mk | 116 ++++++++++++++++++++++---------------------- source4/librpc/rpc/dcerpc.h | 13 +++-- 2 files changed, 68 insertions(+), 61 deletions(-) (limited to 'source4/librpc') diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk index 4ca36a6b3b..55b59cbb26 100644 --- a/source4/librpc/config.mk +++ b/source4/librpc/config.mk @@ -13,7 +13,7 @@ OBJ_FILES = \ ndr/ndr_string.o \ ndr/ndr_obfuscate.o \ ndr/ndr_misc.o -REQUIRED_SUBSYSTEMS = LIBCLI_UTILS LIBTALLOC +REQUIRED_SUBSYSTEMS = LIBCLI_UTILS LIBTALLOC # End SUBSYSTEM LIBNDR ################################################ @@ -319,97 +319,97 @@ REQUIRED_SUBSYSTEMS = NDR_IFACE_TABLE NDR_AUDIOSRV NDR_ECHO NDR_DCERPC NDR_EXCHA [SUBSYSTEM::RPC_NDR_ROT] OBJ_FILES = gen_ndr/ndr_rot_c.o -REQUIRED_SUBSYSTEMS = NDR_ROT LIBRPC +REQUIRED_SUBSYSTEMS = NDR_ROT LIBDCERPC NOPROTO = YES [SUBSYSTEM::RPC_NDR_AUDIOSRV] OBJ_FILES = gen_ndr/ndr_audiosrv_c.o -REQUIRED_SUBSYSTEMS = NDR_AUDIOSRV LIBRPC +REQUIRED_SUBSYSTEMS = NDR_AUDIOSRV LIBDCERPC NOPROTO = YES [SUBSYSTEM::RPC_NDR_ECHO] OBJ_FILES = gen_ndr/ndr_echo_c.o -REQUIRED_SUBSYSTEMS = LIBRPC NDR_ECHO +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_ECHO NOPROTO = YES [SUBSYSTEM::RPC_NDR_EXCHANGE] OBJ_FILES = gen_ndr/ndr_exchange_c.o -REQUIRED_SUBSYSTEMS = LIBRPC NDR_EXCHANGE +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_EXCHANGE NOPROTO = YES [SUBSYSTEM::RPC_NDR_DSBACKUP] OBJ_FILES = gen_ndr/ndr_dsbackup_c.o -REQUIRED_SUBSYSTEMS = LIBRPC NDR_DSBACKUP +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_DSBACKUP NOPROTO = YES [SUBSYSTEM::RPC_NDR_EFS] OBJ_FILES = gen_ndr/ndr_efs_c.o -REQUIRED_SUBSYSTEMS = LIBRPC NDR_EFS +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_EFS NOPROTO = YES [SUBSYSTEM::RPC_NDR_LSA] OBJ_FILES = gen_ndr/ndr_lsa_c.o -REQUIRED_SUBSYSTEMS = LIBRPC NDR_LSA +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_LSA NOPROTO = YES [SUBSYSTEM::RPC_NDR_DFS] OBJ_FILES = gen_ndr/ndr_dfs_c.o -REQUIRED_SUBSYSTEMS = LIBRPC NDR_DFS +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_DFS NOPROTO = YES [SUBSYSTEM::RPC_NDR_DRSUAPI] OBJ_FILES = gen_ndr/ndr_drsuapi_c.o -REQUIRED_SUBSYSTEMS = LIBRPC NDR_DRSUAPI +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_DRSUAPI NOPROTO = YES [SUBSYSTEM::RPC_NDR_DRSBLOBS] OBJ_FILES = gen_ndr/ndr_drsblobs_c.o -REQUIRED_SUBSYSTEMS = LIBRPC NDR_DRSBLOBS +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_DRSBLOBS NOPROTO = YES [SUBSYSTEM::RPC_NDR_POLICYAGENT] OBJ_FILES = gen_ndr/ndr_policyagent_c.o -REQUIRED_SUBSYSTEMS = LIBRPC NDR_POLICYAGENT +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_POLICYAGENT NOPROTO = YES [SUBSYSTEM::RPC_NDR_UNIXINFO] OBJ_FILES = gen_ndr/ndr_unixinfo_c.o -REQUIRED_SUBSYSTEMS = LIBRPC NDR_UNIXINFO +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_UNIXINFO NOPROTO = YES [SUBSYSTEM::RPC_NDR_SAMR] OBJ_FILES = gen_ndr/ndr_samr_c.o -REQUIRED_SUBSYSTEMS = LIBRPC NDR_SAMR +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_SAMR NOPROTO = YES [SUBSYSTEM::RPC_NDR_SPOOLSS] OBJ_FILES = gen_ndr/ndr_spoolss_c.o -REQUIRED_SUBSYSTEMS = LIBRPC NDR_SPOOLSS +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_SPOOLSS NOPROTO = YES [SUBSYSTEM::RPC_NDR_WKSSVC] OBJ_FILES = gen_ndr/ndr_wkssvc_c.o -REQUIRED_SUBSYSTEMS = LIBRPC NDR_WKSSVC +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_WKSSVC NOPROTO = YES [SUBSYSTEM::RPC_NDR_SRVSVC] OBJ_FILES = gen_ndr/ndr_srvsvc_c.o -REQUIRED_SUBSYSTEMS = LIBRPC NDR_SRVSVC +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_SRVSVC NOPROTO = YES [SUBSYSTEM::RPC_NDR_SVCCTL] OBJ_FILES = gen_ndr/ndr_svcctl_c.o -REQUIRED_SUBSYSTEMS = LIBRPC NDR_SVCCTL +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_SVCCTL NOPROTO = YES [SUBSYSTEM::RPC_NDR_ATSVC] OBJ_FILES = gen_ndr/ndr_atsvc_c.o -REQUIRED_SUBSYSTEMS = LIBRPC NDR_ATSVC +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_ATSVC NOPROTO = YES [SUBSYSTEM::RPC_NDR_EVENTLOG] OBJ_FILES = gen_ndr/ndr_eventlog_c.o -REQUIRED_SUBSYSTEMS = LIBRPC NDR_EVENTLOG +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_EVENTLOG NOPROTO = YES [SUBSYSTEM::RPC_NDR_EPMAPPER] @@ -419,82 +419,82 @@ NOPROTO = YES [SUBSYSTEM::RPC_NDR_DBGIDL] OBJ_FILES = gen_ndr/ndr_dbgidl_c.o -REQUIRED_SUBSYSTEMS = LIBRPC NDR_DBGIDL +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_DBGIDL NOPROTO = YES [SUBSYSTEM::RPC_NDR_DSSETUP] OBJ_FILES = gen_ndr/ndr_dssetup_c.o -REQUIRED_SUBSYSTEMS = LIBRPC NDR_DSSETUP +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_DSSETUP NOPROTO = YES [SUBSYSTEM::RPC_NDR_MSGSVC] OBJ_FILES = gen_ndr/ndr_msgsvc_c.o -REQUIRED_SUBSYSTEMS = LIBRPC NDR_MSGSVC +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_MSGSVC NOPROTO = YES [SUBSYSTEM::RPC_NDR_WINS] OBJ_FILES = gen_ndr/ndr_wins_c.o -REQUIRED_SUBSYSTEMS = LIBRPC NDR_WINS +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_WINS NOPROTO = YES [SUBSYSTEM::RPC_NDR_WINREG] OBJ_FILES = gen_ndr/ndr_winreg_c.o -REQUIRED_SUBSYSTEMS = LIBRPC NDR_WINREG +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_WINREG NOPROTO = YES [SUBSYSTEM::RPC_NDR_INITSHUTDOWN] OBJ_FILES = gen_ndr/ndr_initshutdown_c.o -REQUIRED_SUBSYSTEMS = LIBRPC NDR_INITSHUTDOWN +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_INITSHUTDOWN NOPROTO = YES [SUBSYSTEM::RPC_NDR_MGMT] OBJ_FILES = gen_ndr/ndr_mgmt_c.o -REQUIRED_SUBSYSTEMS = LIBRPC NDR_MGMT +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_MGMT NOPROTO = YES [SUBSYSTEM::RPC_NDR_PROTECTED_STORAGE] OBJ_FILES = gen_ndr/ndr_protected_storage_c.o -REQUIRED_SUBSYSTEMS = LIBRPC NDR_PROTECTED_STORAGE +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_PROTECTED_STORAGE NOPROTO = YES [SUBSYSTEM::DCOM_PROXY_DCOM] OBJ_FILES = gen_ndr/ndr_dcom_c.o -REQUIRED_SUBSYSTEMS = LIBRPC NDR_DCOM +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_DCOM NOPROTO = YES [SUBSYSTEM::RPC_NDR_OXIDRESOLVER] OBJ_FILES = gen_ndr/ndr_oxidresolver_c.o -REQUIRED_SUBSYSTEMS = LIBRPC NDR_OXIDRESOLVER +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_OXIDRESOLVER NOPROTO = YES [SUBSYSTEM::RPC_NDR_REMACT] OBJ_FILES = gen_ndr/ndr_remact_c.o -REQUIRED_SUBSYSTEMS = LIBRPC NDR_REMACT +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_REMACT NOPROTO = YES [SUBSYSTEM::RPC_NDR_WZCSVC] OBJ_FILES = gen_ndr/ndr_wzcsvc_c.o -REQUIRED_SUBSYSTEMS = LIBRPC NDR_WZCSVC +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_WZCSVC NOPROTO = YES [SUBSYSTEM::RPC_NDR_BROWSER] OBJ_FILES = gen_ndr/ndr_browser_c.o -REQUIRED_SUBSYSTEMS = LIBRPC NDR_BROWSER +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_BROWSER NOPROTO = YES [SUBSYSTEM::RPC_NDR_W32TIME] OBJ_FILES = gen_ndr/ndr_w32time_c.o -REQUIRED_SUBSYSTEMS = LIBRPC NDR_W32TIME +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_W32TIME NOPROTO = YES [SUBSYSTEM::RPC_NDR_SCERPC] OBJ_FILES = gen_ndr/ndr_scerpc_c.o -REQUIRED_SUBSYSTEMS = LIBRPC NDR_SCERPC +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_SCERPC NOPROTO = YES [SUBSYSTEM::RPC_NDR_NTSVCS] OBJ_FILES = gen_ndr/ndr_ntsvcs_c.o -REQUIRED_SUBSYSTEMS = LIBRPC NDR_NTSVCS +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_NTSVCS NOPROTO = YES [SUBSYSTEM::RPC_NDR_NETLOGON] @@ -504,17 +504,17 @@ NOPROTO = YES [SUBSYSTEM::RPC_NDR_TRKWKS] OBJ_FILES = gen_ndr/ndr_trkwks_c.o -REQUIRED_SUBSYSTEMS = LIBRPC NDR_TRKWKS +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_TRKWKS NOPROTO = YES [SUBSYSTEM::RPC_NDR_KEYSVC] OBJ_FILES = gen_ndr/ndr_keysvc_c.o -REQUIRED_SUBSYSTEMS = LIBRPC NDR_KEYSVC +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_KEYSVC NOPROTO = YES ################################################ -# Start SUBSYSTEM LIBRPC -[LIBRARY::LIBRPC] +# Start SUBSYSTEM LIBDCERPC +[LIBRARY::LIBDCERPC] MAJOR_VERSION = 0 MINOR_VERSION = 0 DESCRIPTION = DCE/RPC client library @@ -531,57 +531,57 @@ OBJ_FILES = \ rpc/dcerpc_smb2.o \ rpc/dcerpc_sock.o \ rpc/dcerpc_connect.o -REQUIRED_SUBSYSTEMS = SOCKET LIBNDR LIBSMB NDR_MISC NDR_DCERPC NDR_SCHANNEL NDR_LSA NDR_NETLOGON NDR_SAMR NDR_UNIXINFO RPC_NDR_NETLOGON RPC_NDR_EPMAPPER -# End SUBSYSTEM LIBRPC +REQUIRED_SUBSYSTEMS = SOCKET LIBNDR LIBSMB NDR_MISC NDR_DCERPC NDR_SCHANNEL NDR_LSA NDR_NETLOGON NDR_SAMR NDR_UNIXINFO RPC_NDR_NETLOGON RPC_NDR_EPMAPPER GENSEC +# End SUBSYSTEM LIBDCERPC ################################################ [MODULE::RPC_EJS_ECHO] INIT_FUNCTION = ejs_init_rpcecho OBJ_FILES = gen_ndr/ndr_echo_ejs.o SUBSYSTEM = SMBCALLS -REQUIRED_SUBSYSTEMS = LIBRPC NDR_ECHO +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_ECHO NOPROTO = YES [MODULE::RPC_EJS_MISC] INIT_FUNCTION = ejs_init_misc OBJ_FILES = gen_ndr/ndr_misc_ejs.o SUBSYSTEM = SMBCALLS -REQUIRED_SUBSYSTEMS = LIBRPC NDR_MISC +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_MISC NOPROTO = YES [MODULE::RPC_EJS_SAMR] INIT_FUNCTION = ejs_init_samr OBJ_FILES = gen_ndr/ndr_samr_ejs.o SUBSYSTEM = SMBCALLS -REQUIRED_SUBSYSTEMS = LIBRPC NDR_SAMR +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_SAMR NOPROTO = YES [MODULE::RPC_EJS_SECURITY] INIT_FUNCTION = ejs_init_security OBJ_FILES = gen_ndr/ndr_security_ejs.o SUBSYSTEM = SMBCALLS -REQUIRED_SUBSYSTEMS = LIBRPC NDR_SECURITY +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_SECURITY NOPROTO = YES [MODULE::RPC_EJS_LSA] INIT_FUNCTION = ejs_init_lsarpc OBJ_FILES = gen_ndr/ndr_lsa_ejs.o SUBSYSTEM = SMBCALLS -REQUIRED_SUBSYSTEMS = LIBRPC NDR_LSA +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_LSA NOPROTO = YES [MODULE::RPC_EJS_DFS] INIT_FUNCTION = ejs_init_netdfs OBJ_FILES = gen_ndr/ndr_dfs_ejs.o SUBSYSTEM = SMBCALLS -REQUIRED_SUBSYSTEMS = LIBRPC NDR_DFS +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_DFS NOPROTO = YES [MODULE::RPC_EJS_DRSUAPI] INIT_FUNCTION = ejs_init_drsuapi OBJ_FILES = gen_ndr/ndr_drsuapi_ejs.o SUBSYSTEM = SMBCALLS -REQUIRED_SUBSYSTEMS = LIBRPC NDR_DRSUAPI +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_DRSUAPI NOPROTO = YES [MODULE::RPC_EJS_SPOOLSS] @@ -589,61 +589,61 @@ INIT_FUNCTION = ejs_init_spoolss OBJ_FILES = gen_ndr/ndr_spoolss_ejs.o SUBSYSTEM = SMBCALLS ENABLE = NO -REQUIRED_SUBSYSTEMS = LIBRPC NDR_SPOOLSS +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_SPOOLSS NOPROTO = YES [MODULE::RPC_EJS_WKSSVC] INIT_FUNCTION = ejs_init_wkssvc OBJ_FILES = gen_ndr/ndr_wkssvc_ejs.o SUBSYSTEM = SMBCALLS -REQUIRED_SUBSYSTEMS = LIBRPC NDR_WKSSVC +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_WKSSVC NOPROTO = YES [MODULE::RPC_EJS_SRVSVC] INIT_FUNCTION = ejs_init_srvsvc OBJ_FILES = gen_ndr/ndr_srvsvc_ejs.o SUBSYSTEM = SMBCALLS -REQUIRED_SUBSYSTEMS = LIBRPC NDR_SRVSVC +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_SRVSVC NOPROTO = YES [MODULE::RPC_EJS_EVENTLOG] INIT_FUNCTION = ejs_init_eventlog OBJ_FILES = gen_ndr/ndr_eventlog_ejs.o SUBSYSTEM = SMBCALLS -REQUIRED_SUBSYSTEMS = LIBRPC NDR_EVENTLOG +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_EVENTLOG NOPROTO = YES [MODULE::RPC_EJS_WINREG] INIT_FUNCTION = ejs_init_winreg OBJ_FILES = gen_ndr/ndr_winreg_ejs.o SUBSYSTEM = SMBCALLS -REQUIRED_SUBSYSTEMS = LIBRPC NDR_WINREG +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_WINREG NOPROTO = YES [MODULE::RPC_EJS_INITSHUTDOWN] INIT_FUNCTION = ejs_init_initshutdown OBJ_FILES = gen_ndr/ndr_initshutdown_ejs.o SUBSYSTEM = SMBCALLS -REQUIRED_SUBSYSTEMS = LIBRPC NDR_INITSHUTDOWN +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_INITSHUTDOWN NOPROTO = YES [MODULE::RPC_EJS_NETLOGON] INIT_FUNCTION = ejs_init_netlogon OBJ_FILES = gen_ndr/ndr_netlogon_ejs.o SUBSYSTEM = SMBCALLS -REQUIRED_SUBSYSTEMS = LIBRPC NDR_NETLOGON +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_NETLOGON NOPROTO = YES [MODULE::RPC_EJS_SVCCTL] INIT_FUNCTION = ejs_init_svcctl OBJ_FILES = gen_ndr/ndr_svcctl_ejs.o SUBSYSTEM = SMBCALLS -REQUIRED_SUBSYSTEMS = LIBRPC NDR_SVCCTL +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_SVCCTL NOPROTO = YES [MODULE::RPC_EJS_IRPC] INIT_FUNCTION = ejs_init_irpc OBJ_FILES = gen_ndr/ndr_irpc_ejs.o SUBSYSTEM = SMBCALLS -REQUIRED_SUBSYSTEMS = LIBRPC NDR_IRPC +REQUIRED_SUBSYSTEMS = LIBDCERPC NDR_IRPC NOPROTO = YES diff --git a/source4/librpc/rpc/dcerpc.h b/source4/librpc/rpc/dcerpc.h index b120933517..4129fb25d8 100644 --- a/source4/librpc/rpc/dcerpc.h +++ b/source4/librpc/rpc/dcerpc.h @@ -21,6 +21,11 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#ifndef __DCERPC_H__ +#define __DCERPC_H__ + +#include + enum dcerpc_transport_t { NCACN_NP, NCACN_IP_TCP, NCACN_IP_UDP, NCACN_VNS_IPC, NCACN_VNS_SPP, NCACN_AT_DSP, NCADG_AT_DDP, NCALRPC, NCACN_UNIX_STREAM, NCADG_UNIX_DGRAM, @@ -45,7 +50,7 @@ struct dcerpc_connection { uint32_t call_id; uint32_t srv_max_xmit_frag; uint32_t srv_max_recv_frag; - uint_t flags; + uint32_t flags; struct dcerpc_security security_state; const char *binding_string; struct event_context *event_ctx; @@ -100,7 +105,7 @@ struct dcerpc_pipe { uint32_t last_fault_code; /* timeout for individual rpc requests, in seconds */ - uint_t request_timeout; + uint32_t request_timeout; }; /* default timeout for all rpc requests, in seconds */ @@ -218,7 +223,7 @@ struct rpc_request { uint32_t call_id; enum rpc_request_state state; DATA_BLOB payload; - uint_t flags; + uint32_t flags; uint32_t fault_code; const struct GUID *object; @@ -241,3 +246,5 @@ struct rpc_request { }; #include "librpc/rpc/dcerpc_proto.h" + +#endif /* __DCERPC_H__ */ -- cgit