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

torture prototypes in seperate header
(This used to be commit 73610639b23ca3743077193fa0b1de7c7f65944d)

32 files changed, 32 insertions, 0 deletions

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"