summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-01-03 13:41:17 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:49:39 -0500
commit25bb00fbcd409572e1c19c05fdc42c883936780b (patch)
treee6096ae728e2a5645e39ede037de0cae39cd12ab
parent097ffed015826ff31b5f89742deed8f4d21b88f3 (diff)
downloadsamba-25bb00fbcd409572e1c19c05fdc42c883936780b.tar.gz
samba-25bb00fbcd409572e1c19c05fdc42c883936780b.tar.bz2
samba-25bb00fbcd409572e1c19c05fdc42c883936780b.zip
r12693: Move core data structures out of smb.h into core.h
torture prototypes in seperate header (This used to be commit 73610639b23ca3743077193fa0b1de7c7f65944d)
-rw-r--r--source4/build/smb_build/TODO1
-rw-r--r--source4/build/smb_build/config_mk.pm7
-rw-r--r--source4/build/smb_build/smb_build_h.pm12
-rw-r--r--source4/include/core.h60
-rw-r--r--source4/include/includes.h14
-rw-r--r--source4/include/smb.h20
-rw-r--r--source4/librpc/config.mk116
-rw-r--r--source4/librpc/rpc/dcerpc.h13
-rw-r--r--source4/main.mk7
-rw-r--r--source4/rpc_server/config.mk34
-rw-r--r--source4/rpc_server/dcerpc_server.c2
-rw-r--r--source4/smbd/config.mk2
-rw-r--r--source4/torture/basic/aliases.c1
-rw-r--r--source4/torture/basic/attr.c1
-rw-r--r--source4/torture/basic/charset.c1
-rw-r--r--source4/torture/basic/delaywrite.c1
-rw-r--r--source4/torture/basic/delete.c1
-rw-r--r--source4/torture/basic/denytest.c1
-rw-r--r--source4/torture/basic/dir.c1
-rw-r--r--source4/torture/basic/disconnect.c1
-rw-r--r--source4/torture/basic/locking.c1
-rw-r--r--source4/torture/basic/mangle_test.c1
-rw-r--r--source4/torture/basic/properties.c1
-rw-r--r--source4/torture/basic/rename.c1
-rw-r--r--source4/torture/basic/scanner.c1
-rw-r--r--source4/torture/basic/secleak.c1
-rw-r--r--source4/torture/basic/unlink.c1
-rw-r--r--source4/torture/basic/utable.c1
-rw-r--r--source4/torture/config.mk1
-rw-r--r--source4/torture/libnet/domain.c1
-rw-r--r--source4/torture/libnet/libnet_share.c1
-rw-r--r--source4/torture/libnet/userinfo.c1
-rw-r--r--source4/torture/libnet/userman.c1
-rw-r--r--source4/torture/local/iconv.c1
-rw-r--r--source4/torture/local/ndr.c1
-rw-r--r--source4/torture/nbench/nbench.c1
-rw-r--r--source4/torture/rap/rap.c1
-rw-r--r--source4/torture/raw/acls.c1
-rw-r--r--source4/torture/raw/chkpath.c1
-rw-r--r--source4/torture/raw/close.c1
-rw-r--r--source4/torture/raw/composite.c1
-rw-r--r--source4/torture/raw/context.c1
-rw-r--r--source4/torture/raw/eas.c1
-rw-r--r--source4/torture/raw/ioctl.c1
-rw-r--r--source4/torture/raw/lock.c1
-rw-r--r--source4/torture/raw/mkdir.c1
-rw-r--r--source4/torture/raw/mux.c1
-rw-r--r--source4/torture/raw/notify.c1
-rw-r--r--source4/torture/raw/open.c1
-rw-r--r--source4/torture/raw/oplock.c1
-rw-r--r--source4/torture/raw/qfileinfo.c1
-rw-r--r--source4/torture/raw/qfsinfo.c1
-rw-r--r--source4/torture/raw/read.c1
-rw-r--r--source4/torture/raw/rename.c1
-rw-r--r--source4/torture/raw/search.c1
-rw-r--r--source4/torture/raw/seek.c1
-rw-r--r--source4/torture/raw/setfileinfo.c1
-rw-r--r--source4/torture/raw/streams.c1
-rw-r--r--source4/torture/raw/unlink.c1
-rw-r--r--source4/torture/raw/write.c1
-rw-r--r--source4/torture/rpc/alter_context.c1
-rw-r--r--source4/torture/rpc/atsvc.c1
-rw-r--r--source4/torture/rpc/autoidl.c1
-rw-r--r--source4/torture/rpc/bench.c1
-rw-r--r--source4/torture/rpc/bind.c1
-rw-r--r--source4/torture/rpc/countcalls.c1
-rw-r--r--source4/torture/rpc/dcom.c1
-rw-r--r--source4/torture/rpc/dfs.c1
-rw-r--r--source4/torture/rpc/drsuapi.c1
-rw-r--r--source4/torture/rpc/drsuapi_cracknames.c1
-rw-r--r--source4/torture/rpc/dssetup.c1
-rw-r--r--source4/torture/rpc/echo.c1
-rw-r--r--source4/torture/rpc/epmapper.c1
-rw-r--r--source4/torture/rpc/eventlog.c1
-rw-r--r--source4/torture/rpc/initshutdown.c1
-rw-r--r--source4/torture/rpc/lsa.c1
-rw-r--r--source4/torture/rpc/mgmt.c1
-rw-r--r--source4/torture/rpc/netlogon.c1
-rw-r--r--source4/torture/rpc/oxidresolve.c1
-rw-r--r--source4/torture/rpc/remact.c1
-rw-r--r--source4/torture/rpc/rot.c1
-rw-r--r--source4/torture/rpc/samr.c1
-rw-r--r--source4/torture/rpc/samsync.c1
-rw-r--r--source4/torture/rpc/scanner.c1
-rw-r--r--source4/torture/rpc/session_key.c1
-rw-r--r--source4/torture/rpc/spoolss.c1
-rw-r--r--source4/torture/rpc/srvsvc.c1
-rw-r--r--source4/torture/rpc/svcctl.c1
-rw-r--r--source4/torture/rpc/testjoin.c1
-rw-r--r--source4/torture/rpc/unixinfo.c1
-rw-r--r--source4/torture/rpc/winreg.c1
-rw-r--r--source4/torture/rpc/wkssvc.c1
92 files changed, 246 insertions, 122 deletions
diff --git a/source4/build/smb_build/TODO b/source4/build/smb_build/TODO
index 487556b513..0657eb2bc8 100644
--- a/source4/build/smb_build/TODO
+++ b/source4/build/smb_build/TODO
@@ -8,3 +8,4 @@
- improve (un)install scripts (rewrite in perl?)
- proper #include dependencies
- determine dependencies from #include lines ?
+- clean up include/smb.h
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm
index 6a8426974f..7827315541 100644
--- a/source4/build/smb_build/config_mk.pm
+++ b/source4/build/smb_build/config_mk.pm
@@ -30,7 +30,9 @@ my $section_types = {
"MANPAGE" => "string",
"PUBLIC_PROTO_HEADER" => "string",
- "PRIVATE_PROTO_HEADER" => "string"
+ "PRIVATE_PROTO_HEADER" => "string",
+
+ "PUBLIC_HEADERS" => "list",
},
"MODULE" => {
"SUBSYSTEM" => "string",
@@ -58,7 +60,8 @@ my $section_types = {
"MANPAGE" => "string",
"INSTALLDIR" => "string",
- "PRIVATE_PROTO_HEADER" => "string"
+ "PRIVATE_PROTO_HEADER" => "string",
+ "PUBLIC_HEADERS" => "string"
},
"LIBRARY" => {
"MAJOR_VERSION" => "string",
diff --git a/source4/build/smb_build/smb_build_h.pm b/source4/build/smb_build/smb_build_h.pm
index 998e1a5990..3b178c8226 100644
--- a/source4/build/smb_build/smb_build_h.pm
+++ b/source4/build/smb_build/smb_build_h.pm
@@ -1,5 +1,5 @@
# SMB Build System
-# - create output for smb_build.h
+# - create output for build.h
#
# Copyright (C) Stefan (metze) Metzmacher 2004
# Released under the GNU GPL
@@ -20,7 +20,7 @@ sub _add_define_section($)
return $output;
}
-sub _prepare_smb_build_h($)
+sub _prepare_build_h($)
{
my $depend = shift;
my @defines = ();
@@ -65,7 +65,7 @@ sub _prepare_smb_build_h($)
}
#
- # loop over all SMB_BUILD_H define sections
+ # loop over all BUILD_H define sections
#
foreach (@defines) { $output .= _add_define_section($_); }
@@ -73,10 +73,10 @@ sub _prepare_smb_build_h($)
}
###########################################################
-# This function creates include/smb_build.h from the SMB_BUILD
+# This function creates include/build.h from the SMB_BUILD
# context
#
-# create_smb_build_h($SMB_BUILD_CTX)
+# create_build_h($SMB_BUILD_CTX)
#
# $SMB_BUILD_CTX - the global SMB_BUILD context
#
@@ -87,7 +87,7 @@ sub create_smb_build_h($$)
open(SMB_BUILD_H,">$file") || die ("Can't open `$file'\n");
print SMB_BUILD_H "/* autogenerated by build/smb_build/main.pl */\n";
- print SMB_BUILD_H _prepare_smb_build_h($CTX);
+ print SMB_BUILD_H _prepare_build_h($CTX);
close(SMB_BUILD_H);
print __FILE__.": creating $file\n";
diff --git a/source4/include/core.h b/source4/include/core.h
new file mode 100644
index 0000000000..08fc2c48ba
--- /dev/null
+++ b/source4/include/core.h
@@ -0,0 +1,60 @@
+/*
+ Unix SMB/CIFS implementation.
+ Core Samba data types
+
+ Copyright (C) Andrew Tridgell 1992-2000
+ Copyright (C) John H Terpstra 1996-2002
+ Copyright (C) Luke Kenneth Casson Leighton 1996-2000
+ Copyright (C) Paul Ashton 1998-2000
+ Copyright (C) Simo Sorce 2001-2002
+ Copyright (C) Martin Pool 2002
+
+ 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 2 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, write to the Free Software
+ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#ifndef _SAMBA_CORE_H
+#define _SAMBA_CORE_H
+
+/*
+ * Define VOLATILE if needed.
+ */
+
+#define False (0)
+#define True (1)
+#define Auto (2)
+
+typedef int BOOL;
+
+/* used to hold an arbitrary blob of data */
+typedef struct datablob {
+ uint8_t *data;
+ size_t length;
+} DATA_BLOB;
+
+struct data_blob_list_item {
+ struct data_blob_list_item *prev,*next;
+ DATA_BLOB blob;
+};
+
+/* by making struct ldb_val and DATA_BLOB the same, we can simplify
+ a fair bit of code */
+#define ldb_val datablob
+
+/* 64 bit time (100 nanosec) 1601 - cifs6.txt, section 3.5, page 30, 4 byte aligned */
+typedef uint64_t NTTIME;
+
+typedef NTSTATUS (*init_module_fn) (void);
+
+#endif /* _SMB_H */
diff --git a/source4/include/includes.h b/source4/include/includes.h
index b6d074f8b2..849850daa6 100644
--- a/source4/include/includes.h
+++ b/source4/include/includes.h
@@ -67,16 +67,6 @@
#define HAVE_ILDAP 1
/*
- * Define VOLATILE if needed.
- */
-
-#define False (0)
-#define True (1)
-#define Auto (2)
-
-typedef int BOOL;
-
-/*
we use struct ipv4_addr to avoid having to include all the
system networking headers everywhere
*/
@@ -84,7 +74,6 @@ struct ipv4_addr {
uint32_t addr;
};
-
#define _PRINTF_ATTRIBUTE(a1, a2) PRINTF_ATTRIBUTE(a1, a2)
#include "lib/replace/replace.h"
@@ -95,12 +84,13 @@ struct ipv4_addr {
#include "structs.h"
#include "trans2.h"
#include "nterr.h"
+#include "core.h"
+#include "smb.h"
#include "charset.h"
#include "debug.h"
#include "doserr.h"
#include "enums.h"
#include "smb_macros.h"
-#include "smb.h"
#include "byteorder.h"
#include "librpc/ndr/libndr.h"
#include "librpc/gen_ndr/dcerpc.h"
diff --git a/source4/include/smb.h b/source4/include/smb.h
index 73385d4373..f7a46e757d 100644
--- a/source4/include/smb.h
+++ b/source4/include/smb.h
@@ -187,24 +187,6 @@ enum smb_signing_state {SMB_SIGNING_OFF, SMB_SIGNING_SUPPORTED,
incorrect parameters - what does it mean? maybe created temporary file? */
#define NTCREATEX_ACTION_UNKNOWN 5
-/* used to hold an arbitrary blob of data */
-typedef struct datablob {
- uint8_t *data;
- size_t length;
-} DATA_BLOB;
-
-struct data_blob_list_item {
- struct data_blob_list_item *prev,*next;
- DATA_BLOB blob;
-};
-
-/* by making struct ldb_val and DATA_BLOB the same, we can simplify
- a fair bit of code */
-#define ldb_val datablob
-
-/* 64 bit time (100 nanosec) 1601 - cifs6.txt, section 3.5, page 30, 4 byte aligned */
-typedef uint64_t NTTIME;
-
#define SMB_MAGIC 0x424D53FF /* 0xFF 'S' 'M' 'B' */
/* the basic packet size, assuming no words or bytes. Does not include the NBT header */
@@ -608,6 +590,4 @@ enum brl_type {READ_LOCK, WRITE_LOCK, PENDING_READ_LOCK, PENDING_WRITE_LOCK};
#define FS_ATTR_ENCRYPTION 0x00020000
#define FS_ATTR_NAMED_STREAMS 0x00040000
-typedef NTSTATUS (*init_module_fn) (void);
-
#endif /* _SMB_H */
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 <nt_status.h>
+
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__ */
diff --git a/source4/main.mk b/source4/main.mk
index 170d7680b4..a600df1a0b 100644
--- a/source4/main.mk
+++ b/source4/main.mk
@@ -31,10 +31,13 @@ include scripting/config.mk
include kdc/config.mk
include passdb/config.mk
+DEFAULT_HEADERS = $(srcdir)/include/nterr.h $(srcdir)/include/nt_status.h \
+ $(srcdir)/include/smb.h
+
binaries: $(BINARIES)
libraries: $(STATIC_LIBS) $(SHARED_LIBS)
modules: $(SHARED_MODULES)
-headers: $(PUBLIC_HEADERS)
+headers: $(PUBLIC_HEADERS) $(DEFAULT_HEADERS)
manpages: $(MANPAGES)
everything: all
@@ -127,7 +130,7 @@ installlib: libraries installdirs
@$(SHELL) $(srcdir)/script/installlib.sh $(DESTDIR)$(LIBDIR) $(STATIC_LIBS)
installheader: headers installdirs
- @$(SHELL) $(srcdir)/script/installheader.sh $(DESTDIR)$(INCLUDEDIR) $(PUBLIC_HEADERS)
+ @$(SHELL) $(srcdir)/script/installheader.sh $(DESTDIR)$(INCLUDEDIR) $(PUBLIC_HEADERS) $(DEFAULT_HEADERS)
installdat: installdirs
@$(SHELL) $(srcdir)/script/installdat.sh $(DESTDIR)$(LIBDIR) $(srcdir)
diff --git a/source4/rpc_server/config.mk b/source4/rpc_server/config.mk
index ac4ca4962a..73f61602bd 100644
--- a/source4/rpc_server/config.mk
+++ b/source4/rpc_server/config.mk
@@ -15,7 +15,7 @@ OBJ_FILES = \
[MODULE::dcerpc_dcom]
ENABLE = NO
INIT_FUNCTION = dcerpc_server_dcom_init
-SUBSYSTEM = DCERPC
+SUBSYSTEM = DCERPC_SERVER
OBJ_FILES = \
dcom/oxidresolver.o \
dcom/rot.o \
@@ -32,7 +32,7 @@ REQUIRED_SUBSYSTEMS = \
# Start MODULE dcerpc_rpcecho
[MODULE::dcerpc_rpcecho]
INIT_FUNCTION = dcerpc_server_rpcecho_init
-SUBSYSTEM = DCERPC
+SUBSYSTEM = DCERPC_SERVER
OBJ_FILES = \
echo/rpc_echo.o
REQUIRED_SUBSYSTEMS = NDR_ECHO
@@ -43,7 +43,7 @@ REQUIRED_SUBSYSTEMS = NDR_ECHO
# Start MODULE dcerpc_epmapper
[MODULE::dcerpc_epmapper]
INIT_FUNCTION = dcerpc_server_epmapper_init
-SUBSYSTEM = DCERPC
+SUBSYSTEM = DCERPC_SERVER
OBJ_FILES = \
epmapper/rpc_epmapper.o
REQUIRED_SUBSYSTEMS = NDR_EPMAPPER
@@ -54,7 +54,7 @@ REQUIRED_SUBSYSTEMS = NDR_EPMAPPER
# Start MODULE dcerpc_remote
[MODULE::dcerpc_remote]
INIT_FUNCTION = dcerpc_server_remote_init
-SUBSYSTEM = DCERPC
+SUBSYSTEM = DCERPC_SERVER
OBJ_FILES = \
remote/dcesrv_remote.o
REQUIRED_SUBSYSTEMS = \
@@ -66,7 +66,7 @@ REQUIRED_SUBSYSTEMS = \
# Start MODULE dcerpc_srvsvc
[MODULE::dcerpc_srvsvc]
INIT_FUNCTION = dcerpc_server_srvsvc_init
-SUBSYSTEM = DCERPC
+SUBSYSTEM = DCERPC_SERVER
OBJ_FILES = \
srvsvc/dcesrv_srvsvc.o
REQUIRED_SUBSYSTEMS = \
@@ -78,7 +78,7 @@ REQUIRED_SUBSYSTEMS = \
# Start MODULE dcerpc_wkssvc
[MODULE::dcerpc_wkssvc]
INIT_FUNCTION = dcerpc_server_wkssvc_init
-SUBSYSTEM = DCERPC
+SUBSYSTEM = DCERPC_SERVER
OBJ_FILES = \
wkssvc/dcesrv_wkssvc.o
REQUIRED_SUBSYSTEMS = \
@@ -90,7 +90,7 @@ REQUIRED_SUBSYSTEMS = \
# Start MODULE dcerpc_unixinfo
[MODULE::dcerpc_unixinfo]
INIT_FUNCTION = dcerpc_server_unixinfo_init
-SUBSYSTEM = DCERPC
+SUBSYSTEM = DCERPC_SERVER
OBJ_FILES = \
unixinfo/dcesrv_unixinfo.o
REQUIRED_SUBSYSTEMS = \
@@ -103,7 +103,7 @@ REQUIRED_SUBSYSTEMS = \
# Start MODULE dcerpc_samr
[MODULE::dcerpc_samr]
INIT_FUNCTION = dcerpc_server_samr_init
-SUBSYSTEM = DCERPC
+SUBSYSTEM = DCERPC_SERVER
OBJ_FILES = \
samr/dcesrv_samr.o \
samr/samr_password.o
@@ -118,7 +118,7 @@ REQUIRED_SUBSYSTEMS = \
# Start MODULE dcerpc_winreg
[MODULE::dcerpc_winreg]
INIT_FUNCTION = dcerpc_server_winreg_init
-SUBSYSTEM = DCERPC
+SUBSYSTEM = DCERPC_SERVER
OUTPUT_TYPE = MERGEDOBJ
OBJ_FILES = \
winreg/rpc_winreg.o
@@ -131,7 +131,7 @@ REQUIRED_SUBSYSTEMS = \
# Start MODULE dcerpc_netlogon
[MODULE::dcerpc_netlogon]
INIT_FUNCTION = dcerpc_server_netlogon_init
-SUBSYSTEM = DCERPC
+SUBSYSTEM = DCERPC_SERVER
OBJ_FILES = \
netlogon/dcerpc_netlogon.o
REQUIRED_SUBSYSTEMS = \
@@ -145,7 +145,7 @@ REQUIRED_SUBSYSTEMS = \
# Start MODULE dcerpc_lsa
[MODULE::dcerpc_lsarpc]
INIT_FUNCTION = dcerpc_server_lsarpc_init
-SUBSYSTEM = DCERPC
+SUBSYSTEM = DCERPC_SERVER
OBJ_FILES = \
lsa/dcesrv_lsa.o
REQUIRED_SUBSYSTEMS = \
@@ -159,7 +159,7 @@ REQUIRED_SUBSYSTEMS = \
# Start MODULE dcerpc_spoolss
[MODULE::dcerpc_spoolss]
INIT_FUNCTION = dcerpc_server_spoolss_init
-SUBSYSTEM = DCERPC
+SUBSYSTEM = DCERPC_SERVER
OUTPUT_TYPE = MERGEDOBJ
OBJ_FILES = \
spoolss/dcesrv_spoolss.o
@@ -174,7 +174,7 @@ REQUIRED_SUBSYSTEMS = \
# Start MODULE dcerpc_drsuapi
[MODULE::dcerpc_drsuapi]
INIT_FUNCTION = dcerpc_server_drsuapi_init
-SUBSYSTEM = DCERPC
+SUBSYSTEM = DCERPC_SERVER
OBJ_FILES = \
drsuapi/dcesrv_drsuapi.o
REQUIRED_SUBSYSTEMS = \
@@ -188,7 +188,7 @@ REQUIRED_SUBSYSTEMS = \
# Start MODULE dcerpc_dssetup
[MODULE::dcerpc_dssetup]
INIT_FUNCTION = dcerpc_server_dssetup_init
-SUBSYSTEM = DCERPC
+SUBSYSTEM = DCERPC_SERVER
OBJ_FILES = \
dssetup/dcesrv_dssetup.o
REQUIRED_SUBSYSTEMS = \
@@ -199,8 +199,8 @@ REQUIRED_SUBSYSTEMS = \
################################################
################################################
-# Start SUBSYSTEM DCERPC
-[SUBSYSTEM::DCERPC]
+# Start SUBSYSTEM DCERPC_SERVER
+[SUBSYSTEM::DCERPC_SERVER]
PRIVATE_PROTO_HEADER = dcerpc_server_proto.h
OBJ_FILES = \
dcerpc_server.o \
@@ -210,7 +210,7 @@ OBJ_FILES = \
REQUIRED_SUBSYSTEMS = \
LIBCLI_AUTH \
LIBNDR \
- LIBRPC
+ LIBDCERPC
#
# End SUBSYSTEM DCERPC
################################################
diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index bd8c40e6fd..2aeb737f5e 100644
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -1319,7 +1319,7 @@ static NTSTATUS dcesrv_init(struct event_context *event_context, const struct mo
NTSTATUS server_service_rpc_init(void)
{
- init_module_fn static_init[] = STATIC_DCERPC_MODULES;
+ init_module_fn static_init[] = STATIC_DCERPC_SERVER_MODULES;
init_module_fn *shared_init = load_samba_modules(NULL, "rpc_server");
run_init_functions(static_init);
diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk
index 6acc30fcaf..16ae45f41f 100644
--- a/source4/smbd/config.mk
+++ b/source4/smbd/config.mk
@@ -28,7 +28,7 @@ INIT_FUNCTION = server_service_rpc_init
SUBSYSTEM = SERVER_SERVICE
OUTPUT_TYPE = MERGEDOBJ
REQUIRED_SUBSYSTEMS = \
- DCERPC
+ DCERPC_SERVER
# End MODULE server_rpc
################################################
diff --git a/source4/torture/basic/aliases.c b/source4/torture/basic/aliases.c
index e4e2b71405..a693d18ce3 100644
--- a/source4/torture/basic/aliases.c
+++ b/source4/torture/basic/aliases.c
@@ -19,6 +19,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "dlinklist.h"
#include "libcli/raw/libcliraw.h"
diff --git a/source4/torture/basic/attr.c b/source4/torture/basic/attr.c
index c37cb2596c..5d13a5f689 100644
--- a/source4/torture/basic/attr.c
+++ b/source4/torture/basic/attr.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
extern int torture_failures;
diff --git a/source4/torture/basic/charset.c b/source4/torture/basic/charset.c
index 2b49690d51..7becdcd8e5 100644
--- a/source4/torture/basic/charset.c
+++ b/source4/torture/basic/charset.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "libcli/raw/libcliraw.h"
#define BASEDIR "\\chartest\\"
diff --git a/source4/torture/basic/delaywrite.c b/source4/torture/basic/delaywrite.c
index ebce013170..5523e1bb41 100644
--- a/source4/torture/basic/delaywrite.c
+++ b/source4/torture/basic/delaywrite.c
@@ -23,6 +23,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "libcli/raw/libcliraw.h"
#include "system/time.h"
#include "system/filesys.h"
diff --git a/source4/torture/basic/delete.c b/source4/torture/basic/delete.c
index 81c3f3f1d1..3138f48d0f 100644
--- a/source4/torture/basic/delete.c
+++ b/source4/torture/basic/delete.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "system/filesys.h"
#include "libcli/raw/libcliraw.h"
diff --git a/source4/torture/basic/denytest.c b/source4/torture/basic/denytest.c
index 1963f866e3..f633f843ff 100644
--- a/source4/torture/basic/denytest.c
+++ b/source4/torture/basic/denytest.c
@@ -19,6 +19,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "system/filesys.h"
#include "libcli/raw/libcliraw.h"
diff --git a/source4/torture/basic/dir.c b/source4/torture/basic/dir.c
index f98c0732e7..49efff8d2e 100644
--- a/source4/torture/basic/dir.c
+++ b/source4/torture/basic/dir.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "system/filesys.h"
static void list_fn(struct clilist_file_info *finfo, const char *name, void *state)
diff --git a/source4/torture/basic/disconnect.c b/source4/torture/basic/disconnect.c
index b585b40bc4..fca5d1968a 100644
--- a/source4/torture/basic/disconnect.c
+++ b/source4/torture/basic/disconnect.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "system/filesys.h"
#include "libcli/raw/libcliraw.h"
diff --git a/source4/torture/basic/locking.c b/source4/torture/basic/locking.c
index 3ab26c3879..e07d0648a7 100644
--- a/source4/torture/basic/locking.c
+++ b/source4/torture/basic/locking.c
@@ -22,6 +22,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "libcli/raw/libcliraw.h"
#include "system/time.h"
#include "system/filesys.h"
diff --git a/source4/torture/basic/mangle_test.c b/source4/torture/basic/mangle_test.c
index 9097a9328b..29bb4fcd18 100644
--- a/source4/torture/basic/mangle_test.c
+++ b/source4/torture/basic/mangle_test.c
@@ -19,6 +19,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "system/filesys.h"
#include "lib/tdb/include/tdbutil.h"
#include "pstring.h"
diff --git a/source4/torture/basic/properties.c b/source4/torture/basic/properties.c
index befdd06602..25a787dead 100644
--- a/source4/torture/basic/properties.c
+++ b/source4/torture/basic/properties.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "libcli/raw/libcliraw.h"
struct bitmapping {
diff --git a/source4/torture/basic/rename.c b/source4/torture/basic/rename.c
index 219dd72b6d..cdb2340b76 100644
--- a/source4/torture/basic/rename.c
+++ b/source4/torture/basic/rename.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
/*
Test rename on files open with share delete and no share delete.
diff --git a/source4/torture/basic/scanner.c b/source4/torture/basic/scanner.c
index 6d78464ef1..5d48ee7124 100644
--- a/source4/torture/basic/scanner.c
+++ b/source4/torture/basic/scanner.c
@@ -19,6 +19,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "libcli/raw/libcliraw.h"
#include "system/filesys.h"
#include "pstring.h"
diff --git a/source4/torture/basic/secleak.c b/source4/torture/basic/secleak.c
index 5eae519211..70fd50834e 100644
--- a/source4/torture/basic/secleak.c
+++ b/source4/torture/basic/secleak.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "libcli/raw/libcliraw.h"
#include "system/time.h"
#include "libcli/smb_composite/smb_composite.h"
diff --git a/source4/torture/basic/unlink.c b/source4/torture/basic/unlink.c
index f046d68b6e..ec889078aa 100644
--- a/source4/torture/basic/unlink.c
+++ b/source4/torture/basic/unlink.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "system/filesys.h"
#include "libcli/raw/libcliraw.h"
diff --git a/source4/torture/basic/utable.c b/source4/torture/basic/utable.c
index ebe9cd9156..f3f7429021 100644
--- a/source4/torture/basic/utable.c
+++ b/source4/torture/basic/utable.c
@@ -19,6 +19,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "system/iconv.h"
#include "system/filesys.h"
#include "pstring.h"
diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index a1776767ff..4f4349bc5e 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -199,6 +199,7 @@ REQUIRED_SUBSYSTEMS = \
# Start BINARY smbtorture
[BINARY::smbtorture]
INSTALLDIR = BINDIR
+PRIVATE_PROTO_HEADER = torture.h
OBJ_FILES = \
torture.o \
torture_util.o
diff --git a/source4/torture/libnet/domain.c b/source4/torture/libnet/domain.c
index 98fb610110..1e2ed956ed 100644
--- a/source4/torture/libnet/domain.c
+++ b/source4/torture/libnet/domain.c
@@ -20,6 +20,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "libnet/composite.h"
#include "libnet/libnet.h"
diff --git a/source4/torture/libnet/libnet_share.c b/source4/torture/libnet/libnet_share.c
index 1f0f5eacd3..5489f42ac8 100644
--- a/source4/torture/libnet/libnet_share.c
+++ b/source4/torture/libnet/libnet_share.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "libnet/libnet.h"
#include "lib/cmdline/popt_common.h"
diff --git a/source4/torture/libnet/userinfo.c b/source4/torture/libnet/userinfo.c
index 3791cfbda7..91bd5b58c6 100644
--- a/source4/torture/libnet/userinfo.c
+++ b/source4/torture/libnet/userinfo.c
@@ -20,6 +20,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "libnet/libnet.h"
#include "libnet/composite.h"
#include "libnet/userinfo.h"
diff --git a/source4/torture/libnet/userman.c b/source4/torture/libnet/userman.c
index 1b5960c301..e942be9341 100644
--- a/source4/torture/libnet/userman.c
+++ b/source4/torture/libnet/userman.c
@@ -20,6 +20,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "libnet/composite.h"
#include "libnet/userman.h"
#include "libnet/libnet.h"
diff --git a/source4/torture/local/iconv.c b/source4/torture/local/iconv.c
index 662816d533..27f7f6fcef 100644
--- a/source4/torture/local/iconv.c
+++ b/source4/torture/local/iconv.c
@@ -22,6 +22,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "system/iconv.h"
#include "system/time.h"
diff --git a/source4/torture/local/ndr.c b/source4/torture/local/ndr.c
index 5daea96655..41302d8638 100644
--- a/source4/torture/local/ndr.c
+++ b/source4/torture/local/ndr.c
@@ -20,6 +20,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
BOOL test_check_string_terminator(TALLOC_CTX *mem_ctx)
{
diff --git a/source4/torture/nbench/nbench.c b/source4/torture/nbench/nbench.c
index 74bfe3e57a..353140a706 100644
--- a/source4/torture/nbench/nbench.c
+++ b/source4/torture/nbench/nbench.c
@@ -19,6 +19,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "system/filesys.h"
#include "pstring.h"
diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c
index 66609b8e80..1b98275e93 100644
--- a/source4/torture/rap/rap.c
+++ b/source4/torture/rap/rap.c
@@ -20,6 +20,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "rap.h"
#include "libcli/raw/libcliraw.h"
diff --git a/source4/torture/raw/acls.c b/source4/torture/raw/acls.c
index fe939f6b63..119377731b 100644
--- a/source4/torture/raw/acls.c
+++ b/source4/torture/raw/acls.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "libcli/raw/libcliraw.h"
#define BASEDIR "\\testsd"
diff --git a/source4/torture/raw/chkpath.c b/source4/torture/raw/chkpath.c
index a4cf1ae071..92fe5dd2d5 100644
--- a/source4/torture/raw/chkpath.c
+++ b/source4/torture/raw/chkpath.c
@@ -19,6 +19,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "libcli/raw/libcliraw.h"
#define BASEDIR "\\rawchkpath"
diff --git a/source4/torture/raw/close.c b/source4/torture/raw/close.c
index 6d55501cd3..67050f30a3 100644
--- a/source4/torture/raw/close.c
+++ b/source4/torture/raw/close.c
@@ -19,6 +19,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "system/time.h"
#include "libcli/raw/libcliraw.h"
diff --git a/source4/torture/raw/composite.c b/source4/torture/raw/composite.c
index fafdb90ec3..f9fe0eb83c 100644
--- a/source4/torture/raw/composite.c
+++ b/source4/torture/raw/composite.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "lib/events/events.h"
#include "libcli/raw/libcliraw.h"
#include "libcli/composite/composite.h"
diff --git a/source4/torture/raw/context.c b/source4/torture/raw/context.c
index 7fb697ea36..8a8bfc85fb 100644
--- a/source4/torture/raw/context.c
+++ b/source4/torture/raw/context.c
@@ -19,6 +19,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "libcli/raw/libcliraw.h"
#include "libcli/composite/composite.h"
#include "libcli/smb_composite/smb_composite.h"
diff --git a/source4/torture/raw/eas.c b/source4/torture/raw/eas.c
index 5616d7554e..a1f9bbfe52 100644
--- a/source4/torture/raw/eas.c
+++ b/source4/torture/raw/eas.c
@@ -22,6 +22,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "libcli/raw/libcliraw.h"
#define BASEDIR "\\testeas"
diff --git a/source4/torture/raw/ioctl.c b/source4/torture/raw/ioctl.c
index 7cce8aa61b..5a88e336cb 100644
--- a/source4/torture/raw/ioctl.c
+++ b/source4/torture/raw/ioctl.c
@@ -20,6 +20,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "ioctl.h"
#include "libcli/raw/libcliraw.h"
diff --git a/source4/torture/raw/lock.c b/source4/torture/raw/lock.c
index b2874351ec..da3c956afb 100644
--- a/source4/torture/raw/lock.c
+++ b/source4/torture/raw/lock.c
@@ -19,6 +19,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "libcli/raw/libcliraw.h"
#include "system/time.h"
#include "system/filesys.h"
diff --git a/source4/torture/raw/mkdir.c b/source4/torture/raw/mkdir.c
index eb63bdee46..e1cc33bf84 100644
--- a/source4/torture/raw/mkdir.c
+++ b/source4/torture/raw/mkdir.c
@@ -19,6 +19,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "libcli/raw/libcliraw.h"
#define BASEDIR "\\mkdirtest"
diff --git a/source4/torture/raw/mux.c b/source4/torture/raw/mux.c
index 13a54c326f..d941c01f1a 100644
--- a/source4/torture/raw/mux.c
+++ b/source4/torture/raw/mux.c
@@ -19,6 +19,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "system/filesys.h"
#include "libcli/raw/libcliraw.h"
diff --git a/source4/torture/raw/notify.c b/source4/torture/raw/notify.c
index 77c7cb30d2..e28ab3a540 100644
--- a/source4/torture/raw/notify.c
+++ b/source4/torture/raw/notify.c
@@ -19,6 +19,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "libcli/raw/libcliraw.h"
#define BASEDIR "\\test_notify"
diff --git a/source4/torture/raw/open.c b/source4/torture/raw/open.c
index 6bb27bf25c..a1d17587e7 100644
--- a/source4/torture/raw/open.c
+++ b/source4/torture/raw/open.c
@@ -19,6 +19,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "libcli/raw/libcliraw.h"
#include "system/time.h"
#include "system/filesys.h"
diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c
index 968bf394a4..512e42d867 100644
--- a/source4/torture/raw/oplock.c
+++ b/source4/torture/raw/oplock.c
@@ -19,6 +19,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "librpc/gen_ndr/ndr_security.h"
#include "libcli/raw/libcliraw.h"
diff --git a/source4/torture/raw/qfileinfo.c b/source4/torture/raw/qfileinfo.c
index eb4066f685..57a2ac69c0 100644
--- a/source4/torture/raw/qfileinfo.c
+++ b/source4/torture/raw/qfileinfo.c
@@ -19,6 +19,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "libcli/raw/libcliraw.h"
static struct {
diff --git a/source4/torture/raw/qfsinfo.c b/source4/torture/raw/qfsinfo.c
index 9d3b703456..2edceeb2b1 100644
--- a/source4/torture/raw/qfsinfo.c
+++ b/source4/torture/raw/qfsinfo.c
@@ -19,6 +19,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "libcli/raw/libcliraw.h"
diff --git a/source4/torture/raw/read.c b/source4/torture/raw/read.c
index d7060ee2c0..cb400d871f 100644
--- a/source4/torture/raw/read.c
+++ b/source4/torture/raw/read.c
@@ -19,6 +19,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "libcli/raw/libcliraw.h"
#include "system/time.h"
#include "system/filesys.h"
diff --git a/source4/torture/raw/rename.c b/source4/torture/raw/rename.c
index f599e1a6c7..99d8116b31 100644
--- a/source4/torture/raw/rename.c
+++ b/source4/torture/raw/rename.c
@@ -19,6 +19,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "libcli/raw/libcliraw.h"
#define CHECK_STATUS(status, correct) do { \
diff --git a/source4/torture/raw/search.c b/source4/torture/raw/search.c
index b009bc5fe8..80d1bb5b3f 100644
--- a/source4/torture/raw/search.c
+++ b/source4/torture/raw/search.c
@@ -19,6 +19,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "system/filesys.h"
#include "libcli/raw/libcliraw.h"
diff --git a/source4/torture/raw/seek.c b/source4/torture/raw/seek.c
index d7d0527bbc..cf16ed2354 100644
--- a/source4/torture/raw/seek.c
+++ b/source4/torture/raw/seek.c
@@ -19,6 +19,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "system/filesys.h"
#include "libcli/raw/libcliraw.h"
diff --git a/source4/torture/raw/setfileinfo.c b/source4/torture/raw/setfileinfo.c
index 6d2dcbc03f..8055fc7575 100644
--- a/source4/torture/raw/setfileinfo.c
+++ b/source4/torture/raw/setfileinfo.c
@@ -19,6 +19,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "system/time.h"
#include "libcli/raw/libcliraw.h"
diff --git a/source4/torture/raw/streams.c b/source4/torture/raw/streams.c
index 7958df00d1..71ff9332fd 100644
--- a/source4/torture/raw/streams.c
+++ b/source4/torture/raw/streams.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "libcli/raw/libcliraw.h"
#include "system/filesys.h"
diff --git a/source4/torture/raw/unlink.c b/source4/torture/raw/unlink.c
index 5a501e6a72..fc92668f38 100644
--- a/source4/torture/raw/unlink.c
+++ b/source4/torture/raw/unlink.c
@@ -19,6 +19,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "system/filesys.h"
#include "libcli/raw/libcliraw.h"
diff --git a/source4/torture/raw/write.c b/source4/torture/raw/write.c
index f7a8e5bcdf..2628950606 100644
--- a/source4/torture/raw/write.c
+++ b/source4/torture/raw/write.c
@@ -20,6 +20,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "libcli/raw/libcliraw.h"
#include "system/time.h"
#include "system/filesys.h"
diff --git a/source4/torture/rpc/alter_context.c b/source4/torture/rpc/alter_context.c
index a85a850472..0f07985917 100644
--- a/source4/torture/rpc/alter_context.c
+++ b/source4/torture/rpc/alter_context.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "librpc/gen_ndr/ndr_lsa.h"
#include "librpc/gen_ndr/ndr_dssetup.h"
diff --git a/source4/torture/rpc/atsvc.c b/source4/torture/rpc/atsvc.c
index 4447c8ac82..7a282dd1be 100644
--- a/source4/torture/rpc/atsvc.c
+++ b/source4/torture/rpc/atsvc.c
@@ -20,6 +20,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "librpc/gen_ndr/ndr_atsvc.h"
static BOOL test_JobGetInfo(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, uint32_t job_id)
diff --git a/source4/torture/rpc/autoidl.c b/source4/torture/rpc/autoidl.c
index 8913092243..32bee5c363 100644
--- a/source4/torture/rpc/autoidl.c
+++ b/source4/torture/rpc/autoidl.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "librpc/gen_ndr/ndr_drsuapi.h"
#include "librpc/gen_ndr/ndr_misc.h"
#include "librpc/rpc/dcerpc_table.h"
diff --git a/source4/torture/rpc/bench.c b/source4/torture/rpc/bench.c
index 21afc560a0..b0605649c3 100644
--- a/source4/torture/rpc/bench.c
+++ b/source4/torture/rpc/bench.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "librpc/gen_ndr/ndr_srvsvc.h"
/**************************/
diff --git a/source4/torture/rpc/bind.c b/source4/torture/rpc/bind.c
index 55ddec2fd5..a1fd3d65b2 100644
--- a/source4/torture/rpc/bind.c
+++ b/source4/torture/rpc/bind.c
@@ -22,6 +22,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "librpc/gen_ndr/ndr_lsa.h"
#include "lib/cmdline/popt_common.h"
diff --git a/source4/torture/rpc/countcalls.c b/source4/torture/rpc/countcalls.c
index bf0b1cd635..9da8e54a91 100644
--- a/source4/torture/rpc/countcalls.c
+++ b/source4/torture/rpc/countcalls.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "librpc/rpc/dcerpc_table.h"
diff --git a/source4/torture/rpc/dcom.c b/source4/torture/rpc/dcom.c
index 6328d3bd7f..71a7c8d0aa 100644
--- a/source4/torture/rpc/dcom.c
+++ b/source4/torture/rpc/dcom.c
@@ -20,6 +20,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "librpc/gen_ndr/ndr_oxidresolver.h"
BOOL torture_rpc_dcom(void)
diff --git a/source4/torture/rpc/dfs.c b/source4/torture/rpc/dfs.c
index c455786a27..3e600a4f44 100644
--- a/source4/torture/rpc/dfs.c
+++ b/source4/torture/rpc/dfs.c
@@ -20,6 +20,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "librpc/gen_ndr/ndr_dfs.h"
diff --git a/source4/torture/rpc/drsuapi.c b/source4/torture/rpc/drsuapi.c
index 9fbf0c21e6..e9c2e9d049 100644
--- a/source4/torture/rpc/drsuapi.c
+++ b/source4/torture/rpc/drsuapi.c
@@ -23,6 +23,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "librpc/gen_ndr/ndr_drsuapi.h"
#include "torture/rpc/drsuapi.h"
diff --git a/source4/torture/rpc/drsuapi_cracknames.c b/source4/torture/rpc/drsuapi_cracknames.c
index 3bfc0ee18a..6af8ed827b 100644
--- a/source4/torture/rpc/drsuapi_cracknames.c
+++ b/source4/torture/rpc/drsuapi_cracknames.c
@@ -23,6 +23,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "librpc/gen_ndr/ndr_drsuapi.h"
#include "torture/rpc/drsuapi.h"
#include "ldb/include/ldb.h"
diff --git a/source4/torture/rpc/dssetup.c b/source4/torture/rpc/dssetup.c
index 2469d66330..ea5925db0c 100644
--- a/source4/torture/rpc/dssetup.c
+++ b/source4/torture/rpc/dssetup.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "librpc/gen_ndr/ndr_dssetup.h"
diff --git a/source4/torture/rpc/echo.c b/source4/torture/rpc/echo.c
index 0064374a01..7df2702d0a 100644
--- a/source4/torture/rpc/echo.c
+++ b/source4/torture/rpc/echo.c
@@ -22,6 +22,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "lib/events/events.h"
#include "librpc/gen_ndr/ndr_echo.h"
diff --git a/source4/torture/rpc/epmapper.c b/source4/torture/rpc/epmapper.c
index f7fa75d559..bf5747eb93 100644
--- a/source4/torture/rpc/epmapper.c
+++ b/source4/torture/rpc/epmapper.c
@@ -20,6 +20,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "librpc/gen_ndr/ndr_epmapper.h"
#include "librpc/rpc/dcerpc_table.h"
diff --git a/source4/torture/rpc/eventlog.c b/source4/torture/rpc/eventlog.c
index 56647cfc3e..64c2b0b4ad 100644
--- a/source4/torture/rpc/eventlog.c
+++ b/source4/torture/rpc/eventlog.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "librpc/gen_ndr/ndr_eventlog.h"
#include "librpc/gen_ndr/ndr_lsa.h"
diff --git a/source4/torture/rpc/initshutdown.c b/source4/torture/rpc/initshutdown.c
index 29893d6515..4b754acf74 100644
--- a/source4/torture/rpc/initshutdown.c
+++ b/source4/torture/rpc/initshutdown.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "librpc/gen_ndr/ndr_initshutdown.h"
static void init_initshutdown_String(TALLOC_CTX *mem_ctx, struct initshutdown_String *name, const char *s)
diff --git a/source4/torture/rpc/lsa.c b/source4/torture/rpc/lsa.c
index 25c73a3fde..3238e31c01 100644
--- a/source4/torture/rpc/lsa.c
+++ b/source4/torture/rpc/lsa.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "librpc/gen_ndr/ndr_lsa.h"
#include "lib/events/events.h"
diff --git a/source4/torture/rpc/mgmt.c b/source4/torture/rpc/mgmt.c
index e216ffe725..5e6f0e366e 100644
--- a/source4/torture/rpc/mgmt.c
+++ b/source4/torture/rpc/mgmt.c
@@ -20,6 +20,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "librpc/gen_ndr/ndr_mgmt.h"
#include "auth/gensec/gensec.h"
#include "librpc/rpc/dcerpc_table.h"
diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index 7893661e83..bdeda05613 100644
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -23,6 +23,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "lib/events/events.h"
#include "auth/auth.h"
#include "lib/cmdline/popt_common.h"
diff --git a/source4/torture/rpc/oxidresolve.c b/source4/torture/rpc/oxidresolve.c
index ffc7307482..837d64cc52 100644
--- a/source4/torture/rpc/oxidresolve.c
+++ b/source4/torture/rpc/oxidresolve.c
@@ -20,6 +20,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "librpc/gen_ndr/ndr_oxidresolver.h"
#include "librpc/gen_ndr/ndr_remact.h"
#include "librpc/gen_ndr/ndr_epmapper.h"
diff --git a/source4/torture/rpc/remact.c b/source4/torture/rpc/remact.c
index 1d1eeae53e..62d1d2e0d6 100644
--- a/source4/torture/rpc/remact.c
+++ b/source4/torture/rpc/remact.c
@@ -20,6 +20,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "librpc/gen_ndr/ndr_remact.h"
#include "librpc/gen_ndr/ndr_epmapper.h"
diff --git a/source4/torture/rpc/rot.c b/source4/torture/rpc/rot.c
index c7694aa408..ccddab086e 100644
--- a/source4/torture/rpc/rot.c
+++ b/source4/torture/rpc/rot.c
@@ -20,6 +20,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "librpc/gen_ndr/ndr_rot.h"
BOOL torture_rpc_rot(void)
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index 3fe622b592..d373e0c817 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "librpc/gen_ndr/ndr_lsa.h"
#include "librpc/gen_ndr/ndr_samr.h"
#include "lib/crypto/crypto.h"
diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c
index afcd17555a..ffab694672 100644
--- a/source4/torture/rpc/samsync.c
+++ b/source4/torture/rpc/samsync.c
@@ -23,6 +23,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "auth/auth.h"
#include "dlinklist.h"
#include "lib/crypto/crypto.h"
diff --git a/source4/torture/rpc/scanner.c b/source4/torture/rpc/scanner.c
index 0916dafc2c..7016043807 100644
--- a/source4/torture/rpc/scanner.c
+++ b/source4/torture/rpc/scanner.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "librpc/gen_ndr/ndr_mgmt.h"
#include "librpc/rpc/dcerpc_table.h"
diff --git a/source4/torture/rpc/session_key.c b/source4/torture/rpc/session_key.c
index 898991d88e..8a9cdea302 100644
--- a/source4/torture/rpc/session_key.c
+++ b/source4/torture/rpc/session_key.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "librpc/gen_ndr/ndr_lsa.h"
static void init_lsa_String(struct lsa_String *name, const char *s)
diff --git a/source4/torture/rpc/spoolss.c b/source4/torture/rpc/spoolss.c
index 89407e33cc..fa2b7df418 100644
--- a/source4/torture/rpc/spoolss.c
+++ b/source4/torture/rpc/spoolss.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "librpc/gen_ndr/ndr_spoolss.h"
struct test_spoolss_context {
diff --git a/source4/torture/rpc/srvsvc.c b/source4/torture/rpc/srvsvc.c
index 422e06f056..2e4f158070 100644
--- a/source4/torture/rpc/srvsvc.c
+++ b/source4/torture/rpc/srvsvc.c
@@ -20,6 +20,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "librpc/gen_ndr/ndr_srvsvc.h"
/**************************/
diff --git a/source4/torture/rpc/svcctl.c b/source4/torture/rpc/svcctl.c
index fc582e7cc9..5f1514419e 100644
--- a/source4/torture/rpc/svcctl.c
+++ b/source4/torture/rpc/svcctl.c
@@ -20,6 +20,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "librpc/gen_ndr/ndr_svcctl.h"
static BOOL test_EnumServicesStatus(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, struct policy_handle *h)
diff --git a/source4/torture/rpc/testjoin.c b/source4/torture/rpc/testjoin.c
index 198f4fdb5b..622b6ac08a 100644
--- a/source4/torture/rpc/testjoin.c
+++ b/source4/torture/rpc/testjoin.c
@@ -26,6 +26,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "system/time.h"
#include "lib/crypto/crypto.h"
#include "libnet/libnet.h"
diff --git a/source4/torture/rpc/unixinfo.c b/source4/torture/rpc/unixinfo.c
index 4403079862..836e5060df 100644
--- a/source4/torture/rpc/unixinfo.c
+++ b/source4/torture/rpc/unixinfo.c
@@ -20,6 +20,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "librpc/gen_ndr/ndr_unixinfo.h"
diff --git a/source4/torture/rpc/winreg.c b/source4/torture/rpc/winreg.c
index 3aaa7521fa..2710215e60 100644
--- a/source4/torture/rpc/winreg.c
+++ b/source4/torture/rpc/winreg.c
@@ -21,6 +21,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "librpc/gen_ndr/ndr_winreg.h"
#define TEST_KEY_BASE "smbtorture test"
diff --git a/source4/torture/rpc/wkssvc.c b/source4/torture/rpc/wkssvc.c
index 7e71fc29b2..6adda319bb 100644
--- a/source4/torture/rpc/wkssvc.c
+++ b/source4/torture/rpc/wkssvc.c
@@ -20,6 +20,7 @@
*/
#include "includes.h"
+#include "torture/torture.h"
#include "librpc/gen_ndr/ndr_wkssvc.h"