r12693: Move core data structures out of smb.h into core.h

torture prototypes in seperate header

diff --git a/source/build/smb_build/TODO b/source/build/smb_build/TODO
index 487556b513b16fa0cf8cf346df68739a1aba4f68..0657eb2bc8ddd3dbd04f565d950d520367ebe663 100644 (file)
--- a/source/build/smb_build/TODO
+++ b/source/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/source/build/smb_build/config_mk.pm b/source/build/smb_build/config_mk.pm
index 6a8426974f42ef73c7b832e016f492cd9cd764be..782731554145edaa8bc2cbb17fe9f0f3b4ce5207 100644 (file)
--- a/source/build/smb_build/config_mk.pm
+++ b/source/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/source/build/smb_build/smb_build_h.pm b/source/build/smb_build/smb_build_h.pm
index 998e1a59906feae66009a15f64975f06c27cecae..3b178c82269bf550bd2e91c2217c13487cffc8db 100644 (file)
--- a/source/build/smb_build/smb_build_h.pm
+++ b/source/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/source/include/core.h b/source/include/core.h
new file mode 100644 (file)
index 0000000..08fc2c4
--- /dev/null
+++ b/source/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/source/include/includes.h b/source/include/includes.h
index b6d074f8b22a57bf397701699b3358209a25414f..849850daa6664e14292e8bc98c1ec9ee21580e65 100644 (file)
--- a/source/include/includes.h
+++ b/source/include/includes.h
@@ -66,16 +66,6 @@
 /* tell ldb we have the internal ldap code */
 #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/source/include/smb.h b/source/include/smb.h
index 73385d43737f11592ca5742cc79a5d67e1d96e5d..f7a46e757d9a85981efc0bdacb9e081631bc9b7a 100644 (file)
--- a/source/include/smb.h
+++ b/source/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/source/librpc/config.mk b/source/librpc/config.mk
index 4ca36a6b3b7fd5ae79c4cd845dcd4fd2466c660d..55b59cbb2620b60c1e5c2915cb74837baa39193a 100644 (file)
--- a/source/librpc/config.mk
+++ b/source/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/source/librpc/rpc/dcerpc.h b/source/librpc/rpc/dcerpc.h
index b12093351798a6ec3c0b9f88eae414e6f08b4d73..4129fb25d884801ad5cfd9ed2702722ff9441eae 100644 (file)
--- a/source/librpc/rpc/dcerpc.h
+++ b/source/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/source/main.mk b/source/main.mk
index 170d7680b468d310ecfb33cb9fe5a8fc3b3fd000..a600df1a0b78a3994f42f09ddff92900e3115be6 100644 (file)
--- a/source/main.mk
+++ b/source/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/source/rpc_server/config.mk b/source/rpc_server/config.mk
index ac4ca4962ac07cead119c75230c107146e0531b1..73f61602bd447374ad0052a8de85d754b19bc5d3 100644 (file)
--- a/source/rpc_server/config.mk
+++ b/source/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/source/rpc_server/dcerpc_server.c b/source/rpc_server/dcerpc_server.c
index bd8c40e6fdeab9f4e01a7e249d78191c45d5aa57..2aeb737f5e7e789205330f436719e05e7c5dea8b 100644 (file)
--- a/source/rpc_server/dcerpc_server.c
+++ b/source/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/source/smbd/config.mk b/source/smbd/config.mk
index 6acc30fcafbf539060edf0a4491faa0d71935cf3..16ae45f41f276a5e4bbc420a7d71a464d02cfec2 100644 (file)
--- a/source/smbd/config.mk
+++ b/source/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/source/torture/basic/aliases.c b/source/torture/basic/aliases.c
index e4e2b7140554f79a1040184cb5da4f4bfac66e0a..a693d18ce3ec1aef47e6d06a905f632615a19cc4 100644 (file)
--- a/source/torture/basic/aliases.c
+++ b/source/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/source/torture/basic/attr.c b/source/torture/basic/attr.c
index c37cb2596c51f451d13fe2469569b059b25690e9..5d13a5f689cecb3bf56b8643c994547ed6bbfc9b 100644 (file)
--- a/source/torture/basic/attr.c
+++ b/source/torture/basic/attr.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "torture/torture.h"
 
 extern int torture_failures;
 

diff --git a/source/torture/basic/charset.c b/source/torture/basic/charset.c
index 2b49690d51a71c6f4a2beec754bc5d387278c896..7becdcd8e5c7f94766dd32dc39938815c61384cf 100644 (file)
--- a/source/torture/basic/charset.c
+++ b/source/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/source/torture/basic/delaywrite.c b/source/torture/basic/delaywrite.c
index ebce013170235b6bcd58b1a7650817810266ea3e..5523e1bb41eb576bc5618a73813e35f75980bd5f 100644 (file)
--- a/source/torture/basic/delaywrite.c
+++ b/source/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/source/torture/basic/delete.c b/source/torture/basic/delete.c
index 81c3f3f1d1651c3cb4b66fedbd680ebc828e709a..3138f48d0fc92faa273833f3645e7bb397a5d52c 100644 (file)
--- a/source/torture/basic/delete.c
+++ b/source/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/source/torture/basic/denytest.c b/source/torture/basic/denytest.c
index 1963f866e30bf9faf5eb22b3f973f52b1b9182b2..f633f843ffa85820fffda3e2b0ec990fde8f698f 100644 (file)
--- a/source/torture/basic/denytest.c
+++ b/source/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/source/torture/basic/dir.c b/source/torture/basic/dir.c
index f98c0732e74f1e2caae877e6c3c7c67bad7042a8..49efff8d2e44cfd088a92f90636c71f42d156b6b 100644 (file)
--- a/source/torture/basic/dir.c
+++ b/source/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/source/torture/basic/disconnect.c b/source/torture/basic/disconnect.c
index b585b40bc41534022743ecd27c3df2b4c847477a..fca5d1968a438be0b66587a03da38adfe8e6c604 100644 (file)
--- a/source/torture/basic/disconnect.c
+++ b/source/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/source/torture/basic/locking.c b/source/torture/basic/locking.c
index 3ab26c3879ea25241954df4dcc553dec5e896c6e..e07d0648a7c5bd8f598244a7a594f5b16ee55e0d 100644 (file)
--- a/source/torture/basic/locking.c
+++ b/source/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/source/torture/basic/mangle_test.c b/source/torture/basic/mangle_test.c
index 9097a9328b5eb315dfb1b14812bcb662ccbdead4..29bb4fcd18fa3f16fa52ae179e1a5ae4c9936339 100644 (file)
--- a/source/torture/basic/mangle_test.c
+++ b/source/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/source/torture/basic/properties.c b/source/torture/basic/properties.c
index befdd0660245c108f63e592a1e8cfc0b25df0ac6..25a787deadb9df201276b56e57f32d53925b7456 100644 (file)
--- a/source/torture/basic/properties.c
+++ b/source/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/source/torture/basic/rename.c b/source/torture/basic/rename.c
index 219dd72b6d2be3da4f038ccde45f06eb01d4e86a..cdb2340b76c0846b578cb647170cdb23a275f437 100644 (file)
--- a/source/torture/basic/rename.c
+++ b/source/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/source/torture/basic/scanner.c b/source/torture/basic/scanner.c
index 6d78464ef198332a8e4bcfd7594144bff1ca52fc..5d48ee712481c0d6be9b6dcc67b8e09434716872 100644 (file)
--- a/source/torture/basic/scanner.c
+++ b/source/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/source/torture/basic/secleak.c b/source/torture/basic/secleak.c
index 5eae519211130cdca98a99b4835d0c1fb95de5e9..70fd50834e2643e013a9564aa6ca49f60ea830a3 100644 (file)
--- a/source/torture/basic/secleak.c
+++ b/source/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/source/torture/basic/unlink.c b/source/torture/basic/unlink.c
index f046d68b6ed59f77fcf259ea8cf2a6988e9c0182..ec889078aa37f7bd0e085083e97fae2b0d2397f8 100644 (file)
--- a/source/torture/basic/unlink.c
+++ b/source/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/source/torture/basic/utable.c b/source/torture/basic/utable.c
index ebe9cd915681f4425650afbc52e6d6b58b3eb2c3..f3f7429021c8b03c34833a5f92e61138be2923bc 100644 (file)
--- a/source/torture/basic/utable.c
+++ b/source/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/source/torture/config.mk b/source/torture/config.mk
index a1776767ff772486b0f8189b4769c0ee24d9c77a..4f4349bc5e37dc56ec3c58f20ee1547b0bb07afd 100644 (file)
--- a/source/torture/config.mk
+++ b/source/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/source/torture/libnet/domain.c b/source/torture/libnet/domain.c
index 98fb6101102d76b3a476871b025517ac8f654ca9..1e2ed956edd1f5e45cb00b71f6cb2bb4865f9711 100644 (file)
--- a/source/torture/libnet/domain.c
+++ b/source/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/source/torture/libnet/libnet_share.c b/source/torture/libnet/libnet_share.c
index 1f0f5eacd37312cc7178b517641d8876e3d32c14..5489f42ac8fefb1c5fc1680cd5cb90d696ff0e0c 100644 (file)
--- a/source/torture/libnet/libnet_share.c
+++ b/source/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/source/torture/libnet/userinfo.c b/source/torture/libnet/userinfo.c
index 3791cfbda71b197c66935e0a4c6552397db9b70b..91bd5b58c68a6b3343a75b84d84f25f54dd1b130 100644 (file)
--- a/source/torture/libnet/userinfo.c
+++ b/source/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/source/torture/libnet/userman.c b/source/torture/libnet/userman.c
index 1b5960c3014ad60af73e69ba42c48b58e12bdc22..e942be9341ab11c9857efaf5290d56a85ade4702 100644 (file)
--- a/source/torture/libnet/userman.c
+++ b/source/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/source/torture/local/iconv.c b/source/torture/local/iconv.c
index 662816d5338bf29dba66c1d57c0353b2189965c3..27f7f6fcef24e0f22e5a45262b2337db45d44da6 100644 (file)
--- a/source/torture/local/iconv.c
+++ b/source/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/source/torture/local/ndr.c b/source/torture/local/ndr.c
index 5daea966559a4204ac91dc7fd33078f3a441a77c..41302d86380e3da3c8d8486820eec18d789a21b6 100644 (file)
--- a/source/torture/local/ndr.c
+++ b/source/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/source/torture/nbench/nbench.c b/source/torture/nbench/nbench.c
index 74bfe3e57a64fe79e8f4b2c39988ae0b1f555457..353140a70632327c2baa953c511a959ca576364c 100644 (file)
--- a/source/torture/nbench/nbench.c
+++ b/source/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/source/torture/rap/rap.c b/source/torture/rap/rap.c
index 66609b8e80f18183fd7832a08493ed5ae968586f..1b98275e93f2b2f130441a70cf12651c46a29bc4 100644 (file)
--- a/source/torture/rap/rap.c
+++ b/source/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/source/torture/raw/acls.c b/source/torture/raw/acls.c
index fe939f6b63f9ae60b17cf099c7e3f2e7634dc75a..119377731be041c4035d132133e75558316cd8ef 100644 (file)
--- a/source/torture/raw/acls.c
+++ b/source/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/source/torture/raw/chkpath.c b/source/torture/raw/chkpath.c
index a4cf1ae071a737426bfcee57fba48b66ba7eebe2..92fe5dd2d515a6f5ae3c0962a64d953832c55ea1 100644 (file)
--- a/source/torture/raw/chkpath.c
+++ b/source/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/source/torture/raw/close.c b/source/torture/raw/close.c
index 6d55501cd38defa18dc2b84fecf6ea3419280b23..67050f30a3a7ee6896f176e7d837e7cf8f3b4cc7 100644 (file)
--- a/source/torture/raw/close.c
+++ b/source/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/source/torture/raw/composite.c b/source/torture/raw/composite.c
index fafdb90ec3af3b319ed67c536b7214e2db833ef9..f9fe0eb83c6fbc72fe9734ab8078993ea6340c19 100644 (file)
--- a/source/torture/raw/composite.c
+++ b/source/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/source/torture/raw/context.c b/source/torture/raw/context.c
index 7fb697ea365628b3319334d742d94499f151d3cf..8a8bfc85fb6c226d57da380d5d4bd56aa1e9b229 100644 (file)
--- a/source/torture/raw/context.c
+++ b/source/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/source/torture/raw/eas.c b/source/torture/raw/eas.c
index 5616d7554eeae3630d6214c2dc94f5416ecf6028..a1f9bbfe5214aa716afbdb9859a3c2a9ad7fda3a 100644 (file)
--- a/source/torture/raw/eas.c
+++ b/source/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/source/torture/raw/ioctl.c b/source/torture/raw/ioctl.c
index 7cce8aa61b2ac8948408428db1ec564676b5733a..5a88e336cbb565ed5e69075622c49f42a1340329 100644 (file)
--- a/source/torture/raw/ioctl.c
+++ b/source/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/source/torture/raw/lock.c b/source/torture/raw/lock.c
index b2874351ec37f600a5e6ce7dc2f5737f565cd8f7..da3c956afb1dbdf727a6286eb4cef586a0f76759 100644 (file)
--- a/source/torture/raw/lock.c
+++ b/source/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/source/torture/raw/mkdir.c b/source/torture/raw/mkdir.c
index eb63bdee46f9f565cb1ed5227c7c8be24ee06f7c..e1cc33bf84d362300331bba46fc466282b9ea199 100644 (file)
--- a/source/torture/raw/mkdir.c
+++ b/source/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/source/torture/raw/mux.c b/source/torture/raw/mux.c
index 13a54c326f8153481b4ca29331a0f288a33ce097..d941c01f1a746291c43086de0c79773e35a13778 100644 (file)
--- a/source/torture/raw/mux.c
+++ b/source/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/source/torture/raw/notify.c b/source/torture/raw/notify.c
index 77c7cb30d2ca5b7745e862bff6e17db1dcdcbe5d..e28ab3a54052e68539c5ab4738e978491db18068 100644 (file)
--- a/source/torture/raw/notify.c
+++ b/source/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/source/torture/raw/open.c b/source/torture/raw/open.c
index 6bb27bf25c2b4e66fe79e3be352360848dd21429..a1d17587e7858f20798e3f37dfa05be393178a0e 100644 (file)
--- a/source/torture/raw/open.c
+++ b/source/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/source/torture/raw/oplock.c b/source/torture/raw/oplock.c
index 968bf394a4c8386775f358af971b12c9e7e82307..512e42d867191a53fc47bc627ca850d7edc0306a 100644 (file)
--- a/source/torture/raw/oplock.c
+++ b/source/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/source/torture/raw/qfileinfo.c b/source/torture/raw/qfileinfo.c
index eb4066f68576e4ccf62af5f843e2853b990310ac..57a2ac69c04c45dc7e30de6722b42d819f7eb6a6 100644 (file)
--- a/source/torture/raw/qfileinfo.c
+++ b/source/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/source/torture/raw/qfsinfo.c b/source/torture/raw/qfsinfo.c
index 9d3b703456a0860513179ffd71822380409a366e..2edceeb2b16027a395e0eaab7dd5b4c23154985d 100644 (file)
--- a/source/torture/raw/qfsinfo.c
+++ b/source/torture/raw/qfsinfo.c
@@ -19,6 +19,7 @@
 */
 
 #include "includes.h"
+#include "torture/torture.h"
 #include "libcli/raw/libcliraw.h"
 
 

diff --git a/source/torture/raw/read.c b/source/torture/raw/read.c
index d7060ee2c01dd6d4252e8cb94c532e29bf424cd3..cb400d871fd7ee0477185747c8c787e82b0102bd 100644 (file)
--- a/source/torture/raw/read.c
+++ b/source/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/source/torture/raw/rename.c b/source/torture/raw/rename.c
index f599e1a6c78e9cb79c6abc3c5899f7c0263c3804..99d8116b319fe1cb40a085b386d59b5404a0c227 100644 (file)
--- a/source/torture/raw/rename.c
+++ b/source/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/source/torture/raw/search.c b/source/torture/raw/search.c
index b009bc5fe89d7a7e30c00ed5c8a1a647c1249660..80d1bb5b3f5eea9e870863ecafec075e94345b46 100644 (file)
--- a/source/torture/raw/search.c
+++ b/source/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/source/torture/raw/seek.c b/source/torture/raw/seek.c
index d7d0527bbcc1e859bea692c5222e1ba87c064fa6..cf16ed2354aa02b5d94eda990aa98bc6871bd253 100644 (file)
--- a/source/torture/raw/seek.c
+++ b/source/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/source/torture/raw/setfileinfo.c b/source/torture/raw/setfileinfo.c
index 6d2dcbc03f07f1e4186836256caa20e2c390db56..8055fc7575fb42630971fd7b270e8bdc1db808f4 100644 (file)
--- a/source/torture/raw/setfileinfo.c
+++ b/source/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/source/torture/raw/streams.c b/source/torture/raw/streams.c
index 7958df00d15cb890c4e11699fe4c8b24d5ae684f..71ff9332fd78225a103bda87c87f02ba3fd4a58c 100644 (file)
--- a/source/torture/raw/streams.c
+++ b/source/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/source/torture/raw/unlink.c b/source/torture/raw/unlink.c
index 5a501e6a722ab0230fa56881a654ee5b4d796bfd..fc92668f385dde95921584dcbde9d7307d224cf6 100644 (file)
--- a/source/torture/raw/unlink.c
+++ b/source/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/source/torture/raw/write.c b/source/torture/raw/write.c
index f7a8e5bcdf63998a3b2f2afc7f88b75f9ce7e79a..26289506064a626c1c7f7ad6da5744a916941ad0 100644 (file)
--- a/source/torture/raw/write.c
+++ b/source/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/source/torture/rpc/alter_context.c b/source/torture/rpc/alter_context.c
index a85a8504721894678c274b02912387b29cd1988e..0f079859175b9cfda99ee4523adb12297849a9bc 100644 (file)
--- a/source/torture/rpc/alter_context.c
+++ b/source/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/source/torture/rpc/atsvc.c b/source/torture/rpc/atsvc.c
index 4447c8ac82747e2e66644eeac495ad9b8d55f138..7a282dd1be013acf53f92b99f924b836bea791c7 100644 (file)
--- a/source/torture/rpc/atsvc.c
+++ b/source/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/source/torture/rpc/autoidl.c b/source/torture/rpc/autoidl.c
index 891309224396940e9070ecc266ba7ac2ce1f83df..32bee5c3631a80070f3f41813ba65e09b6046578 100644 (file)
--- a/source/torture/rpc/autoidl.c
+++ b/source/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/source/torture/rpc/bench.c b/source/torture/rpc/bench.c
index 21afc560a08559d93372a677c8df367441d60b34..b0605649c3ac8c1497a39902fbb70969fa8831de 100644 (file)
--- a/source/torture/rpc/bench.c
+++ b/source/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/source/torture/rpc/bind.c b/source/torture/rpc/bind.c
index 55ddec2fd51d9523629042218f5b53684495ff3f..a1fd3d65b2cf2e707c37ab42f9ee5e3a10c9e5f7 100644 (file)
--- a/source/torture/rpc/bind.c
+++ b/source/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/source/torture/rpc/countcalls.c b/source/torture/rpc/countcalls.c
index bf0b1cd6354ce6d538e92d458c4e89bbeb2b51a8..9da8e54a91aafdaad04ed52626ded614e6b7bec5 100644 (file)
--- a/source/torture/rpc/countcalls.c
+++ b/source/torture/rpc/countcalls.c
@@ -21,6 +21,7 @@
 */
 
 #include "includes.h"
+#include "torture/torture.h"
 #include "librpc/rpc/dcerpc_table.h"
 
 

diff --git a/source/torture/rpc/dcom.c b/source/torture/rpc/dcom.c
index 6328d3bd7f43f25a6819f7f6157c3ab329dee21b..71a7c8d0aa5ca47ee7a5b10a6b14128e54631d49 100644 (file)
--- a/source/torture/rpc/dcom.c
+++ b/source/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/source/torture/rpc/dfs.c b/source/torture/rpc/dfs.c
index c455786a2713c371ca51af38e52ba0149083022a..3e600a4f44408b7c3b447bde888acfc5c487a4a5 100644 (file)
--- a/source/torture/rpc/dfs.c
+++ b/source/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/source/torture/rpc/drsuapi.c b/source/torture/rpc/drsuapi.c
index 9fbf0c21e68d6bcc7b403d8e0a3fd1388c88fe9a..e9c2e9d049d883a880b83a6ee869f36607943757 100644 (file)
--- a/source/torture/rpc/drsuapi.c
+++ b/source/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/source/torture/rpc/drsuapi_cracknames.c b/source/torture/rpc/drsuapi_cracknames.c
index 3bfc0ee18aedcb0eaf408576ff90db6594de10b0..6af8ed827bf1f2fbc4e3e021b461a297d6d0b4d3 100644 (file)
--- a/source/torture/rpc/drsuapi_cracknames.c
+++ b/source/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/source/torture/rpc/dssetup.c b/source/torture/rpc/dssetup.c
index 2469d66330dcead63b2cd647629e6d5c8f11ab37..ea5925db0c4c9cb9193ef3f35aa2f16c98fb599c 100644 (file)
--- a/source/torture/rpc/dssetup.c
+++ b/source/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/source/torture/rpc/echo.c b/source/torture/rpc/echo.c
index 0064374a01a499a0e1c475942ec6be94f96a42a6..7df2702d0a12c8729cf6a70c2bc18f016f5ccc80 100644 (file)
--- a/source/torture/rpc/echo.c
+++ b/source/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/source/torture/rpc/epmapper.c b/source/torture/rpc/epmapper.c
index f7fa75d559d17f44cb3a05f22c7785d2a4598048..bf5747eb9344254d770c5db57198394264a49f9f 100644 (file)
--- a/source/torture/rpc/epmapper.c
+++ b/source/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/source/torture/rpc/eventlog.c b/source/torture/rpc/eventlog.c
index 56647cfc3ee590034970f1faebed22758e44b7e9..64c2b0b4ad39fcb6575ab8497f71f6bad3189ace 100644 (file)
--- a/source/torture/rpc/eventlog.c
+++ b/source/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/source/torture/rpc/initshutdown.c b/source/torture/rpc/initshutdown.c
index 29893d65151a2da1aad53d4ecf32f8f5ea85bdf1..4b754acf74bfcf6cfad8f2603ff80597e52c5011 100644 (file)
--- a/source/torture/rpc/initshutdown.c
+++ b/source/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/source/torture/rpc/lsa.c b/source/torture/rpc/lsa.c
index 25c73a3fde9edc53b22aca981f936a32ac20f7ed..3238e31c017df1e1c8064a32023a55c0e7e24006 100644 (file)
--- a/source/torture/rpc/lsa.c
+++ b/source/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/source/torture/rpc/mgmt.c b/source/torture/rpc/mgmt.c
index e216ffe725673e6f399be4ce8cb2bebac7ebf226..5e6f0e366eee31ccba284feb1f9119a35fd1107d 100644 (file)
--- a/source/torture/rpc/mgmt.c
+++ b/source/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/source/torture/rpc/netlogon.c b/source/torture/rpc/netlogon.c
index 7893661e83f04c855b895d9477eeb2e7bb4bb54b..bdeda0561382fc34a9834bb763e8d4ebafa5a71a 100644 (file)
--- a/source/torture/rpc/netlogon.c
+++ b/source/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/source/torture/rpc/oxidresolve.c b/source/torture/rpc/oxidresolve.c
index ffc73074822233e07b9b7f63982e54f967ae1927..837d64cc529e945e03eb6e4ef2a9abeddead94fe 100644 (file)
--- a/source/torture/rpc/oxidresolve.c
+++ b/source/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/source/torture/rpc/remact.c b/source/torture/rpc/remact.c
index 1d1eeae53e0f5dda231f63ececbaa13a646e0b6b..62d1d2e0d69810cadd893b2211d743ff227339f9 100644 (file)
--- a/source/torture/rpc/remact.c
+++ b/source/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/source/torture/rpc/rot.c b/source/torture/rpc/rot.c
index c7694aa408a6a73991e49eb038732d3b0340b2c3..ccddab086e95683991e257c61c17650dc2d20f5f 100644 (file)
--- a/source/torture/rpc/rot.c
+++ b/source/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/source/torture/rpc/samr.c b/source/torture/rpc/samr.c
index 3fe622b5924bb303fcb81ba7a0221087ac77e484..d373e0c817da1c544977ca1398e8836a6aed8511 100644 (file)
--- a/source/torture/rpc/samr.c
+++ b/source/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/source/torture/rpc/samsync.c b/source/torture/rpc/samsync.c
index afcd17555ad889ef80c8b2a21778f0c72176cd4b..ffab69467287d3312f36921752cc5d62c3e6fe14 100644 (file)
--- a/source/torture/rpc/samsync.c
+++ b/source/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/source/torture/rpc/scanner.c b/source/torture/rpc/scanner.c
index 0916dafc2c474ba018a01899f620bbe136a75087..70160438078be90abc2d10a242dc21d40a33cd7a 100644 (file)
--- a/source/torture/rpc/scanner.c
+++ b/source/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/source/torture/rpc/session_key.c b/source/torture/rpc/session_key.c
index 898991d88ee6a86e3439951beb253f9e04164737..8a9cdea30279114fc3e9bde7232e394e488c6d87 100644 (file)
--- a/source/torture/rpc/session_key.c
+++ b/source/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/source/torture/rpc/spoolss.c b/source/torture/rpc/spoolss.c
index 89407e33cc13a2e231f94126d04255b4482090d5..fa2b7df418a5f51ec904294ffda8bd257aa11573 100644 (file)
--- a/source/torture/rpc/spoolss.c
+++ b/source/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/source/torture/rpc/srvsvc.c b/source/torture/rpc/srvsvc.c
index 422e06f0560c00dd046f64d53900f185c3defbe2..2e4f15807082d695a72f23b5ea204ecc7aed7c2e 100644 (file)
--- a/source/torture/rpc/srvsvc.c
+++ b/source/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/source/torture/rpc/svcctl.c b/source/torture/rpc/svcctl.c
index fc582e7cc97b54cb07095dd64bdbce7083e21eba..5f1514419ec0b8134217fb47837ee430e29d560c 100644 (file)
--- a/source/torture/rpc/svcctl.c
+++ b/source/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/source/torture/rpc/testjoin.c b/source/torture/rpc/testjoin.c
index 198f4fdb5b1e4e3b0c9f68180ec9212055944279..622b6ac08adfbb1b1422005db9e2c6b0bf656b3f 100644 (file)
--- a/source/torture/rpc/testjoin.c
+++ b/source/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/source/torture/rpc/unixinfo.c b/source/torture/rpc/unixinfo.c
index 4403079862d5459b490f29b3766ce42d068b059f..836e5060dfdfbe8a251f4a3c1bfe379da43d9ba6 100644 (file)
--- a/source/torture/rpc/unixinfo.c
+++ b/source/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/source/torture/rpc/winreg.c b/source/torture/rpc/winreg.c
index 3aaa7521fa5014ba827086096b54cabacd2a11a3..2710215e602fbb35cbe6b2e0c92b032fd78e0811 100644 (file)
--- a/source/torture/rpc/winreg.c
+++ b/source/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/source/torture/rpc/wkssvc.c b/source/torture/rpc/wkssvc.c
index 7e71fc29b26cb1f07d9f3ff73b4ee3f1c407a007..6adda319bb4c1e1db322a49f9ea0ee098ded7093 100644 (file)
--- a/source/torture/rpc/wkssvc.c
+++ b/source/torture/rpc/wkssvc.c
@@ -20,6 +20,7 @@
 */
 
 #include "includes.h"
+#include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_wkssvc.h"