r13346: use private proto header files for the torture tests

metze
(This used to be commit 67837dbd2bcff8ec1917ba02884ee2eaa0776b46)

diff --git a/source4/torture/basic/delete.c b/source4/torture/basic/delete.c
index ac168b3ed47a7a224b1d4f7bab86ce6c3b1ee669..983f67ad1a2bf77c526910863ac887b2433627dc 100644 (file)
--- a/source4/torture/basic/delete.c
+++ b/source4/torture/basic/delete.c
@@ -26,6 +26,8 @@
 #include "system/filesys.h"
 #include "libcli/raw/libcliraw.h"
 
+#include "torture/raw/proto.h"
+
 static BOOL check_delete_on_close(struct smbcli_state *cli, int fnum,
                                  const char *fname, BOOL expect_it)
 {

diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index c7e8e2cc4828e5d542c303d98371f6f5e66fbcd1..fdc2006ef840e12c975151ced828f7f71526b010 100644 (file)
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -3,6 +3,8 @@
 #################################
 # Start SUBSYSTEM TORTURE_BASIC
 [SUBSYSTEM::TORTURE_BASIC]
+PRIVATE_PROTO_HEADER = \
+               basic/proto.h
 OBJ_FILES = \
                basic/scanner.o \
                basic/utable.o \
@@ -28,6 +30,8 @@ REQUIRED_SUBSYSTEMS = \
 #################################
 # Start SUBSYSTEM TORTURE_RAW
 [SUBSYSTEM::TORTURE_RAW]
+PRIVATE_PROTO_HEADER = \
+               raw/proto.h
 OBJ_FILES = \
                raw/qfsinfo.o \
                raw/qfileinfo.o \
@@ -62,6 +66,8 @@ include smb2/config.mk
 #################################
 # Start SUBSYSTEM TORTURE_COM
 [SUBSYSTEM::TORTURE_COM]
+PRIVATE_PROTO_HEADER = \
+               com/proto.h
 OBJ_FILES = \
                com/simple.o
 REQUIRED_SUBSYSTEMS = \
@@ -72,6 +78,8 @@ REQUIRED_SUBSYSTEMS = \
 #################################
 # Start SUBSYSTEM TORTURE_RPC
 [SUBSYSTEM::TORTURE_RPC]
+PRIVATE_PROTO_HEADER = \
+               rpc/proto.h
 OBJ_FILES = \
                rpc/join.o \
                rpc/lsa.o \
@@ -123,6 +131,8 @@ REQUIRED_SUBSYSTEMS = \
 #################################
 # Start SUBSYSTEM TORTURE_RAP
 [SUBSYSTEM::TORTURE_RAP]
+PRIVATE_PROTO_HEADER = \
+               rap/proto.h
 OBJ_FILES = \
                rap/rap.o
 REQUIRED_SUBSYSTEMS = \
@@ -133,6 +143,8 @@ REQUIRED_SUBSYSTEMS = \
 #################################
 # Start SUBSYSTEM TORTURE_AUTH
 [SUBSYSTEM::TORTURE_AUTH]
+PRIVATE_PROTO_HEADER = \
+               auth/proto.h
 OBJ_FILES = \
                auth/ntlmssp.o \
                auth/pac.o
@@ -146,6 +158,8 @@ include local/config.mk
 #################################
 # Start SUBSYSTEM TORTURE_NBENCH
 [SUBSYSTEM::TORTURE_NBENCH]
+PRIVATE_PROTO_HEADER = \
+               nbench/proto.h
 OBJ_FILES = \
                nbench/nbio.o \
                nbench/nbench.o
@@ -155,6 +169,8 @@ OBJ_FILES = \
 #################################
 # Start SUBSYSTEM TORTURE_LDAP
 [SUBSYSTEM::TORTURE_LDAP]
+PRIVATE_PROTO_HEADER = \
+               ldap/proto.h
 OBJ_FILES = \
                ldap/common.o \
                ldap/basic.o \
@@ -168,6 +184,8 @@ REQUIRED_SUBSYSTEMS = \
 #################################
 # Start SUBSYSTEM TORTURE_NBT
 [SUBSYSTEM::TORTURE_NBT]
+PRIVATE_PROTO_HEADER = \
+               nbt/proto.h
 OBJ_FILES = \
                nbt/query.o \
                nbt/register.o \
@@ -184,6 +202,8 @@ REQUIRED_SUBSYSTEMS = \
 #################################
 # Start SUBSYSTEM TORTURE_NET
 [SUBSYSTEM::TORTURE_NET]
+PRIVATE_PROTO_HEADER = \
+               libnet/proto.h
 OBJ_FILES = \
                libnet/userinfo.o \
                libnet/userman.o \

diff --git a/source4/torture/ldap/basic.c b/source4/torture/ldap/basic.c
index 64c4dbfdf01b4209f079aa3e040ab30ca168696d..b7a2242c954806f8277fc54d47fd2595b69bdc44 100644 (file)
--- a/source4/torture/ldap/basic.c
+++ b/source4/torture/ldap/basic.c
@@ -25,6 +25,8 @@
 #include "libcli/ldap/ldap_client.h"
 #include "lib/cmdline/popt_common.h"
 
+#include "torture/ldap/proto.h"
+
 static BOOL test_bind_simple(struct ldap_connection *conn, const char *userdn, const char *password)
 {
        NTSTATUS status;

diff --git a/source4/torture/local/config.mk b/source4/torture/local/config.mk
index f45fb2247d89e10ce0a162a5b9560c4551df639b..7ee7a13d587de88282b425c1061bb2c9539f941b 100644 (file)
--- a/source4/torture/local/config.mk
+++ b/source4/torture/local/config.mk
@@ -1,6 +1,8 @@
 #################################
 # Start SUBSYSTEM TORTURE_LOCAL
 [SUBSYSTEM::TORTURE_LOCAL]
+PRIVATE_PROTO_HEADER = \
+               proto.h
 OBJ_FILES = \
                iconv.o \
                ../../lib/talloc/testsuite.o \

diff --git a/source4/torture/nbench/nbench.c b/source4/torture/nbench/nbench.c
index 4357dd53a10dba73dcd9012e27d21e29f038cdc3..77a94145f51dc526061522d4f23a29f87b604c2b 100644 (file)
--- a/source4/torture/nbench/nbench.c
+++ b/source4/torture/nbench/nbench.c
@@ -24,6 +24,8 @@
 #include "system/filesys.h"
 #include "pstring.h"
 
+#include "torture/nbench/proto.h"
+
 int nbench_line_count = 0;
 static int timelimit = 600;
 static int warmup;

diff --git a/source4/torture/nbt/dgram.c b/source4/torture/nbt/dgram.c
index 821a169314b91d0823bfa5b57902048cdf6231f0..f44b81932915928647eabb7fa3c067f78524d415 100644 (file)
--- a/source4/torture/nbt/dgram.c
+++ b/source4/torture/nbt/dgram.c
@@ -25,6 +25,7 @@
 #include "librpc/gen_ndr/ndr_samr.h"
 #include "lib/socket/socket.h"
 #include "lib/events/events.h"
+#include "torture/rpc/proto.h"
 
 #define TEST_NAME "TORTURE_TEST"
 

diff --git a/source4/torture/rpc/alter_context.c b/source4/torture/rpc/alter_context.c
index 0f079859175b9cfda99ee4523adb12297849a9bc..d75d367a1e634ec43b712e5a35cee80182128f32 100644 (file)
--- a/source4/torture/rpc/alter_context.c
+++ b/source4/torture/rpc/alter_context.c
@@ -24,7 +24,7 @@
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 #include "librpc/gen_ndr/ndr_dssetup.h"
-
+#include "torture/rpc/proto.h"
 
 BOOL torture_rpc_alter_context(void)
 {

diff --git a/source4/torture/rpc/drsuapi.c b/source4/torture/rpc/drsuapi.c
index e9c2e9d049d883a880b83a6ee869f36607943757..e63915992a3cd30a21652b1d2b0e2205d32da9c6 100644 (file)
--- a/source4/torture/rpc/drsuapi.c
+++ b/source4/torture/rpc/drsuapi.c
@@ -26,6 +26,7 @@
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_drsuapi.h"
 #include "torture/rpc/drsuapi.h"
+#include "torture/rpc/proto.h"
 
 BOOL test_DsBind(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 
                 struct DsPrivate *priv)

diff --git a/source4/torture/rpc/drsuapi_cracknames.c b/source4/torture/rpc/drsuapi_cracknames.c
index 6af8ed827bf1f2fbc4e3e021b461a297d6d0b4d3..227ddb200e12f04fcdb8677dbca4c53a7e97efee 100644 (file)
--- a/source4/torture/rpc/drsuapi_cracknames.c
+++ b/source4/torture/rpc/drsuapi_cracknames.c
@@ -26,6 +26,7 @@
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_drsuapi.h"
 #include "torture/rpc/drsuapi.h"
+#include "torture/rpc/proto.h"
 #include "ldb/include/ldb.h"
 
 static BOOL test_DsCrackNamesMatrix(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx, 

diff --git a/source4/torture/rpc/dssync.c b/source4/torture/rpc/dssync.c
index 4079afba15eabb5215fab0daef5beff27e5cd13c..3731f19c617249c4cbbe8e84d1cfbb2baeb7e08b 100644 (file)
--- a/source4/torture/rpc/dssync.c
+++ b/source4/torture/rpc/dssync.c
@@ -25,6 +25,7 @@
 #include "lib/cmdline/popt_common.h"
 #include "librpc/gen_ndr/ndr_drsuapi.h"
 #include "libcli/cldap/cldap.h"
+#include "torture/ldap/proto.h"
 
 struct DsSyncBindInfo {
        struct dcerpc_pipe *pipe;

diff --git a/source4/torture/rpc/join.c b/source4/torture/rpc/join.c
index 8ea94279be6e3b97fe0f065ab25b87f1b4dc10aa..b9ffe32f2f42297d8425ad20bfdc306c2557c013 100644 (file)
--- a/source4/torture/rpc/join.c
+++ b/source4/torture/rpc/join.c
@@ -1,6 +1,8 @@
 #include "includes.h"
 #include "libnet/libnet.h"
 
+#include "torture/rpc/proto.h"
+
 #define TORTURE_NETBIOS_NAME "smbtorturejoin"
 
 

diff --git a/source4/torture/rpc/netlogon.c b/source4/torture/rpc/netlogon.c
index 6dc3158a9f40b31ac0b16d84beb4b9a5fbef5284..7919e7c441ea215150954194434dd307066c3307 100644 (file)
--- a/source4/torture/rpc/netlogon.c
+++ b/source4/torture/rpc/netlogon.c
@@ -28,6 +28,7 @@
 #include "auth/auth.h"
 #include "smb.h"
 #include "lib/cmdline/popt_common.h"
+#include "torture/rpc/proto.h"
 
 static const char *machine_password;
 

diff --git a/source4/torture/rpc/samlogon.c b/source4/torture/rpc/samlogon.c
index af29d44347d4b45814aaa4a9150db3229b14f32d..69c9ff6ea9d7a634302fc98ac3070880980755e6 100644 (file)
--- a/source4/torture/rpc/samlogon.c
+++ b/source4/torture/rpc/samlogon.c
@@ -27,6 +27,7 @@
 #include "auth/auth.h"
 #include "lib/crypto/crypto.h"
 #include "lib/cmdline/popt_common.h"
+#include "torture/rpc/proto.h"
 
 #define TEST_MACHINE_NAME "samlogontest"
 #define TEST_USER_NAME "samlogontestuser"

diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c
index ffab69467287d3312f36921752cc5d62c3e6fe14..afa47e5932d9ff54bb91dfbb4cbe2d8fc33a0649 100644 (file)
--- a/source4/torture/rpc/samsync.c
+++ b/source4/torture/rpc/samsync.c
@@ -28,6 +28,7 @@
 #include "dlinklist.h"
 #include "lib/crypto/crypto.h"
 #include "system/time.h"
+#include "torture/rpc/proto.h"
 
 #define TEST_MACHINE_NAME "samsynctest"
 #define TEST_WKSTA_MACHINE_NAME "samsynctest2"

diff --git a/source4/torture/rpc/schannel.c b/source4/torture/rpc/schannel.c
index eba9affce0b465fbe41132775e44ed990aa44f28..4e9d644138dfbf488ae715b7bb2359b4c42772aa 100644 (file)
--- a/source4/torture/rpc/schannel.c
+++ b/source4/torture/rpc/schannel.c
@@ -22,6 +22,7 @@
 
 #include "includes.h"
 #include "librpc/gen_ndr/ndr_netlogon.h"
+#include "torture/rpc/proto.h"
 
 #define TEST_MACHINE_NAME "schannel"
 

diff --git a/source4/torture/rpc/session_key.c b/source4/torture/rpc/session_key.c
index 8a9cdea30279114fc3e9bde7232e394e488c6d87..26626c908ee6847550006e6a5cb4a36be514d031 100644 (file)
--- a/source4/torture/rpc/session_key.c
+++ b/source4/torture/rpc/session_key.c
@@ -24,6 +24,8 @@
 #include "torture/torture.h"
 #include "librpc/gen_ndr/ndr_lsa.h"
 
+#include "torture/rpc/proto.h"
+
 static void init_lsa_String(struct lsa_String *name, const char *s)
 {
        name->string = s;

diff --git a/source4/torture/rpc/testjoin.c b/source4/torture/rpc/testjoin.c
index f844ad8ca8509c1fb65ef571d03bc2c0ec958729..39634b9186a5771378aacd9d6c921f2de1077065 100644 (file)
--- a/source4/torture/rpc/testjoin.c
+++ b/source4/torture/rpc/testjoin.c
@@ -34,6 +34,7 @@
 #include "smb.h"
 #include "lib/ldb/include/ldb.h"
 
+#include "torture/rpc/proto.h"
 
 struct test_join {
        struct dcerpc_pipe *p;

diff --git a/source4/torture/smb2/config.mk b/source4/torture/smb2/config.mk
index 90e57bd6d86e009717fd890fac50bb56f2606a07..8c95208151fcb1cd73c8a8b1396ab9120b46045c 100644 (file)
--- a/source4/torture/smb2/config.mk
+++ b/source4/torture/smb2/config.mk
@@ -2,6 +2,8 @@
 #################################
 # Start SUBSYSTEM TORTURE_SMB2
 [SUBSYSTEM::TORTURE_SMB2]
+PRIVATE_PROTO_HEADER = \
+               proto.h
 OBJ_FILES = \
                connect.o \
                scan.o \

diff --git a/source4/torture/smb2/connect.c b/source4/torture/smb2/connect.c
index d4016b87703b580a338956671ecca20913419592..747249389481905df41da688963b2724181ff9fe 100644 (file)
--- a/source4/torture/smb2/connect.c
+++ b/source4/torture/smb2/connect.c
@@ -25,6 +25,8 @@
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
 
+#include "torture/smb2/proto.h"
+
 /*
   send a close
 */

diff --git a/source4/torture/smb2/find.c b/source4/torture/smb2/find.c
index aae8f8042f43dbc5d85d3056632d88bf7b2b1d1c..07c3f865e2adca7890add542bc7659b44ac3bbff 100644 (file)
--- a/source4/torture/smb2/find.c
+++ b/source4/torture/smb2/find.c
@@ -24,6 +24,8 @@
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
 
+#include "torture/smb2/proto.h"
+
 static struct {
        const char *name;
        uint16_t level;

diff --git a/source4/torture/smb2/getinfo.c b/source4/torture/smb2/getinfo.c
index faf889f8ff9293f27bc2a659e581f1bb2ade61f7..2e3d2f2facbe9c16f66ec8aec1b5932208158a73 100644 (file)
--- a/source4/torture/smb2/getinfo.c
+++ b/source4/torture/smb2/getinfo.c
@@ -24,6 +24,8 @@
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
 
+#include "torture/smb2/proto.h"
+
 static struct {
        const char *name;
        uint16_t level;

diff --git a/source4/torture/smb2/scan.c b/source4/torture/smb2/scan.c
index 646f790e181f13965583839ccd6978811a857a27..44dced94277ffd84572ace35c813c12fc322180d 100644 (file)
--- a/source4/torture/smb2/scan.c
+++ b/source4/torture/smb2/scan.c
@@ -26,6 +26,7 @@
 #include "lib/cmdline/popt_common.h"
 #include "lib/events/events.h"
 
+#include "torture/smb2/proto.h"
 
 #define FNAME "scan-getinfo.dat"
 #define DNAME "scan-getinfo.dir"

diff --git a/source4/torture/smb2/setinfo.c b/source4/torture/smb2/setinfo.c
index bf63d26dbb815fa4a88e4bfcfbf57ba681521339..562493b047a7666a89cf4c39e934b1599bba3145 100644 (file)
--- a/source4/torture/smb2/setinfo.c
+++ b/source4/torture/smb2/setinfo.c
@@ -25,6 +25,8 @@
 #include "libcli/smb2/smb2.h"
 #include "libcli/smb2/smb2_calls.h"
 
+#include "torture/smb2/proto.h"
+
 #define BASEDIR ""
 
 /* basic testing of all SMB2 setinfo calls 

diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index a37fde693888489eec3e76ff6f7545634777f658..9eded4d29e44bbf9a2a65ae59c637467ccdd9008 100644 (file)
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -28,6 +28,19 @@
 #include "libcli/libcli.h"
 #include "librpc/rpc/dcerpc_table.h"
 
+#include "torture/basic/proto.h"
+#include "torture/raw/proto.h"
+#include "torture/smb2/proto.h"
+#include "torture/rpc/proto.h"
+#include "torture/rap/proto.h"
+#include "torture/auth/proto.h"
+#include "torture/local/proto.h"
+#include "torture/nbench/proto.h"
+#include "torture/ldap/proto.h"
+#include "torture/com/proto.h"
+#include "torture/nbt/proto.h"
+#include "torture/libnet/proto.h"
+
 int torture_nprocs=4;
 int torture_numops=10;
 int torture_entries=1000;