diff options
Diffstat (limited to 'source4/torture')
49 files changed, 114 insertions, 11 deletions
diff --git a/source4/torture/auth/ntlmssp.c b/source4/torture/auth/ntlmssp.c index f2cc0a91824..9366de986a4 100644 --- a/source4/torture/auth/ntlmssp.c +++ b/source4/torture/auth/ntlmssp.c @@ -19,6 +19,7 @@ #include "includes.h" #include "auth/gensec/gensec.h" +#include "auth/gensec/gensec_proto.h" #include "auth/ntlmssp/ntlmssp.h" #include "lib/cmdline/popt_common.h" #include "torture/torture.h" @@ -141,7 +142,7 @@ static bool torture_ntlmssp_self_check(struct torture_context *tctx) return true; } -_PUBLIC_ struct torture_suite *torture_ntlmssp(TALLOC_CTX *mem_ctx) +struct torture_suite *torture_ntlmssp(TALLOC_CTX *mem_ctx) { struct torture_suite *suite = torture_suite_create(mem_ctx, "NTLMSSP"); diff --git a/source4/torture/auth/pac.c b/source4/torture/auth/pac.c index 68bbd3483a2..7fdd7e58bfb 100644 --- a/source4/torture/auth/pac.c +++ b/source4/torture/auth/pac.c @@ -28,6 +28,7 @@ #include "samba3/samba3.h" #include "libcli/security/security.h" #include "torture/torture.h" +#include "auth/session_proto.h" static bool torture_pac_self_check(struct torture_context *tctx) { @@ -659,7 +660,7 @@ static bool torture_pac_saved_check(struct torture_context *tctx) return true; } -_PUBLIC_ struct torture_suite *torture_pac(TALLOC_CTX *mem_ctx) +struct torture_suite *torture_pac(TALLOC_CTX *mem_ctx) { struct torture_suite *suite = torture_suite_create(mem_ctx, "PAC"); diff --git a/source4/torture/basic/aliases.c b/source4/torture/basic/aliases.c index 660009704b9..89146de99d8 100644 --- a/source4/torture/basic/aliases.c +++ b/source4/torture/basic/aliases.c @@ -20,6 +20,7 @@ #include "includes.h" #include "lib/util/dlinklist.h" #include "libcli/raw/libcliraw.h" +#include "libcli/raw/raw_proto.h" #include "torture/torture.h" #include "libcli/libcli.h" #include "torture/util.h" diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c index 66f9359744d..ac71d14116b 100644 --- a/source4/torture/basic/base.c +++ b/source4/torture/basic/base.c @@ -22,6 +22,7 @@ #include "torture/torture.h" #include "torture/basic/proto.h" #include "libcli/libcli.h" +#include "libcli/raw/raw_proto.h" #include "torture/util.h" #include "system/filesys.h" #include "system/time.h" diff --git a/source4/torture/basic/delaywrite.c b/source4/torture/basic/delaywrite.c index 8644c656eba..e3d63c09ecc 100644 --- a/source4/torture/basic/delaywrite.c +++ b/source4/torture/basic/delaywrite.c @@ -24,6 +24,7 @@ #include "includes.h" #include "torture/torture.h" #include "libcli/raw/libcliraw.h" +#include "libcli/raw/raw_proto.h" #include "system/time.h" #include "system/filesys.h" #include "libcli/libcli.h" diff --git a/source4/torture/basic/delete.c b/source4/torture/basic/delete.c index 8b84880c06c..b71c85aeb87 100644 --- a/source4/torture/basic/delete.c +++ b/source4/torture/basic/delete.c @@ -25,6 +25,7 @@ #include "torture/util.h" #include "system/filesys.h" #include "libcli/raw/libcliraw.h" +#include "libcli/raw/raw_proto.h" #include "torture/raw/proto.h" diff --git a/source4/torture/basic/disconnect.c b/source4/torture/basic/disconnect.c index 09f54ed6a70..89e05d6839f 100644 --- a/source4/torture/basic/disconnect.c +++ b/source4/torture/basic/disconnect.c @@ -23,6 +23,7 @@ #include "torture/torture.h" #include "system/filesys.h" #include "libcli/raw/libcliraw.h" +#include "libcli/raw/raw_proto.h" #include "libcli/libcli.h" #include "torture/util.h" diff --git a/source4/torture/basic/misc.c b/source4/torture/basic/misc.c index d991f117cdc..188fc1bc69b 100644 --- a/source4/torture/basic/misc.c +++ b/source4/torture/basic/misc.c @@ -20,6 +20,7 @@ #include "includes.h" #include "libcli/raw/libcliraw.h" +#include "libcli/raw/raw_proto.h" #include "system/time.h" #include "system/wait.h" #include "system/filesys.h" diff --git a/source4/torture/basic/scanner.c b/source4/torture/basic/scanner.c index d462f97da4a..6ccd4ba1cca 100644 --- a/source4/torture/basic/scanner.c +++ b/source4/torture/basic/scanner.c @@ -22,6 +22,7 @@ #include "libcli/libcli.h" #include "torture/util.h" #include "libcli/raw/libcliraw.h" +#include "libcli/raw/raw_proto.h" #include "system/filesys.h" #include "param/param.h" diff --git a/source4/torture/basic/secleak.c b/source4/torture/basic/secleak.c index d0c048425d1..4caeee72a47 100644 --- a/source4/torture/basic/secleak.c +++ b/source4/torture/basic/secleak.c @@ -22,10 +22,12 @@ #include "includes.h" #include "torture/torture.h" #include "libcli/raw/libcliraw.h" +#include "libcli/raw/raw_proto.h" #include "libcli/libcli.h" #include "torture/util.h" #include "system/time.h" #include "libcli/smb_composite/smb_composite.h" +#include "libcli/smb_composite/proto.h" #include "auth/credentials/credentials.h" #include "param/param.h" diff --git a/source4/torture/ldap/common.c b/source4/torture/ldap/common.c index 11b11dcc00d..65b02ed5e8e 100644 --- a/source4/torture/ldap/common.c +++ b/source4/torture/ldap/common.c @@ -21,7 +21,7 @@ */ #include "includes.h" -#include "libcli/ldap/ldap.h" +#include "libcli/ldap/ldap_client.h" #include "torture/torture.h" #include "torture/ldap/proto.h" @@ -38,7 +38,7 @@ NTSTATUS torture_ldap_bind(struct ldap_connection *conn, const char *userdn, con return status; } -_PUBLIC_ NTSTATUS torture_ldap_bind_sasl(struct ldap_connection *conn, +NTSTATUS torture_ldap_bind_sasl(struct ldap_connection *conn, struct cli_credentials *creds, struct loadparm_context *lp_ctx) { @@ -54,7 +54,7 @@ _PUBLIC_ NTSTATUS torture_ldap_bind_sasl(struct ldap_connection *conn, } /* open a ldap connection to a server */ -_PUBLIC_ NTSTATUS torture_ldap_connection(struct torture_context *tctx, +NTSTATUS torture_ldap_connection(struct torture_context *tctx, struct ldap_connection **conn, const char *url) { diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c index edc74ee23e6..4b5f4b582c5 100644 --- a/source4/torture/rap/rap.c +++ b/source4/torture/rap/rap.c @@ -443,7 +443,7 @@ static bool test_netserverenum(struct torture_context *tctx, return true; } -_PUBLIC_ NTSTATUS smbcli_rap_netservergetinfo(struct smbcli_tree *tree, +NTSTATUS smbcli_rap_netservergetinfo(struct smbcli_tree *tree, struct smb_iconv_convenience *iconv_convenience, TALLOC_CTX *mem_ctx, struct rap_WserverGetInfo *r) diff --git a/source4/torture/raw/chkpath.c b/source4/torture/raw/chkpath.c index 7fd74e3cbee..2ed83d308cf 100644 --- a/source4/torture/raw/chkpath.c +++ b/source4/torture/raw/chkpath.c @@ -20,6 +20,7 @@ #include "includes.h" #include "torture/torture.h" #include "libcli/raw/libcliraw.h" +#include "libcli/raw/raw_proto.h" #include "libcli/libcli.h" #include "torture/util.h" diff --git a/source4/torture/raw/close.c b/source4/torture/raw/close.c index 6f139f8530d..01175836df0 100644 --- a/source4/torture/raw/close.c +++ b/source4/torture/raw/close.c @@ -21,6 +21,7 @@ #include "torture/torture.h" #include "system/time.h" #include "libcli/raw/libcliraw.h" +#include "libcli/raw/raw_proto.h" #include "libcli/libcli.h" #include "torture/util.h" diff --git a/source4/torture/raw/context.c b/source4/torture/raw/context.c index 20135d2fa91..15e736fff51 100644 --- a/source4/torture/raw/context.c +++ b/source4/torture/raw/context.c @@ -20,6 +20,7 @@ #include "includes.h" #include "torture/torture.h" #include "libcli/raw/libcliraw.h" +#include "libcli/raw/raw_proto.h" #include "libcli/composite/composite.h" #include "libcli/smb_composite/smb_composite.h" #include "lib/cmdline/popt_common.h" diff --git a/source4/torture/raw/ioctl.c b/source4/torture/raw/ioctl.c index c4dd4c5bf2b..4cb366f807d 100644 --- a/source4/torture/raw/ioctl.c +++ b/source4/torture/raw/ioctl.c @@ -22,6 +22,7 @@ #include "torture/torture.h" #include "libcli/raw/ioctl.h" #include "libcli/raw/libcliraw.h" +#include "libcli/raw/raw_proto.h" #include "libcli/libcli.h" #include "torture/util.h" diff --git a/source4/torture/raw/lock.c b/source4/torture/raw/lock.c index 6eb43bd538e..cd8d6067952 100644 --- a/source4/torture/raw/lock.c +++ b/source4/torture/raw/lock.c @@ -20,6 +20,7 @@ #include "includes.h" #include "torture/torture.h" #include "libcli/raw/libcliraw.h" +#include "libcli/raw/raw_proto.h" #include "system/time.h" #include "system/filesys.h" #include "libcli/libcli.h" diff --git a/source4/torture/raw/lockbench.c b/source4/torture/raw/lockbench.c index 16e9f0ec759..86030c538ab 100644 --- a/source4/torture/raw/lockbench.c +++ b/source4/torture/raw/lockbench.c @@ -22,6 +22,7 @@ #include "includes.h" #include "torture/torture.h" #include "libcli/raw/libcliraw.h" +#include "libcli/raw/raw_proto.h" #include "system/time.h" #include "system/filesys.h" #include "libcli/libcli.h" diff --git a/source4/torture/raw/mkdir.c b/source4/torture/raw/mkdir.c index 93e94150d74..cea959347d8 100644 --- a/source4/torture/raw/mkdir.c +++ b/source4/torture/raw/mkdir.c @@ -20,6 +20,7 @@ #include "includes.h" #include "torture/torture.h" #include "libcli/raw/libcliraw.h" +#include "libcli/raw/raw_proto.h" #include "libcli/libcli.h" #include "torture/util.h" #include "param/param.h" diff --git a/source4/torture/raw/mux.c b/source4/torture/raw/mux.c index 846a9787cb4..5b5db3a5572 100644 --- a/source4/torture/raw/mux.c +++ b/source4/torture/raw/mux.c @@ -21,6 +21,7 @@ #include "torture/torture.h" #include "system/filesys.h" #include "libcli/raw/libcliraw.h" +#include "libcli/raw/raw_proto.h" #include "libcli/libcli.h" #include "torture/util.h" diff --git a/source4/torture/raw/notify.c b/source4/torture/raw/notify.c index 2967abdbe3c..25c91eb88bc 100644 --- a/source4/torture/raw/notify.c +++ b/source4/torture/raw/notify.c @@ -20,6 +20,7 @@ #include "includes.h" #include "torture/torture.h" #include "libcli/raw/libcliraw.h" +#include "libcli/raw/raw_proto.h" #include "libcli/libcli.h" #include "system/filesys.h" #include "torture/util.h" diff --git a/source4/torture/raw/open.c b/source4/torture/raw/open.c index 76bc0ca53de..d28a8bd14eb 100644 --- a/source4/torture/raw/open.c +++ b/source4/torture/raw/open.c @@ -20,6 +20,7 @@ #include "includes.h" #include "torture/torture.h" #include "libcli/raw/libcliraw.h" +#include "libcli/raw/raw_proto.h" #include "system/time.h" #include "system/filesys.h" #include "librpc/gen_ndr/security.h" diff --git a/source4/torture/raw/openbench.c b/source4/torture/raw/openbench.c index e8b2f568135..a5b1434a474 100644 --- a/source4/torture/raw/openbench.c +++ b/source4/torture/raw/openbench.c @@ -22,6 +22,7 @@ #include "includes.h" #include "torture/torture.h" #include "libcli/raw/libcliraw.h" +#include "libcli/raw/raw_proto.h" #include "system/time.h" #include "system/filesys.h" #include "libcli/libcli.h" diff --git a/source4/torture/raw/oplock.c b/source4/torture/raw/oplock.c index 8b2e4fb1771..1927a0f027d 100644 --- a/source4/torture/raw/oplock.c +++ b/source4/torture/raw/oplock.c @@ -21,6 +21,7 @@ #include "torture/torture.h" #include "librpc/gen_ndr/security.h" #include "libcli/raw/libcliraw.h" +#include "libcli/raw/raw_proto.h" #include "libcli/libcli.h" #include "torture/util.h" #include "lib/events/events.h" diff --git a/source4/torture/raw/qfileinfo.c b/source4/torture/raw/qfileinfo.c index 65d803882c6..c7673be5263 100644 --- a/source4/torture/raw/qfileinfo.c +++ b/source4/torture/raw/qfileinfo.c @@ -21,6 +21,7 @@ #include "includes.h" #include "torture/torture.h" #include "libcli/raw/libcliraw.h" +#include "libcli/raw/raw_proto.h" #include "libcli/libcli.h" #include "torture/util.h" #include "librpc/rpc/dcerpc.h" diff --git a/source4/torture/raw/read.c b/source4/torture/raw/read.c index b052da2d69b..c8420c279eb 100644 --- a/source4/torture/raw/read.c +++ b/source4/torture/raw/read.c @@ -20,6 +20,7 @@ #include "includes.h" #include "torture/torture.h" #include "libcli/raw/libcliraw.h" +#include "libcli/raw/raw_proto.h" #include "system/time.h" #include "system/filesys.h" #include "libcli/libcli.h" diff --git a/source4/torture/raw/samba3misc.c b/source4/torture/raw/samba3misc.c index 749b10cc074..15a7f6c4a32 100644 --- a/source4/torture/raw/samba3misc.c +++ b/source4/torture/raw/samba3misc.c @@ -20,6 +20,7 @@ #include "includes.h" #include "torture/torture.h" #include "libcli/raw/libcliraw.h" +#include "libcli/raw/raw_proto.h" #include "system/time.h" #include "system/filesys.h" #include "libcli/libcli.h" diff --git a/source4/torture/raw/search.c b/source4/torture/raw/search.c index 725ed261aac..2a6aef20b59 100644 --- a/source4/torture/raw/search.c +++ b/source4/torture/raw/search.c @@ -21,6 +21,7 @@ #include "torture/torture.h" #include "system/filesys.h" #include "libcli/raw/libcliraw.h" +#include "libcli/raw/raw_proto.h" #include "libcli/libcli.h" #include "torture/util.h" @@ -42,7 +43,7 @@ static bool single_search_callback(void *private, const union smb_search_data *f /* do a single file (non-wildcard) search */ -_PUBLIC_ NTSTATUS torture_single_search(struct smbcli_state *cli, +NTSTATUS torture_single_search(struct smbcli_state *cli, TALLOC_CTX *tctx, const char *pattern, enum smb_search_level level, diff --git a/source4/torture/raw/setfileinfo.c b/source4/torture/raw/setfileinfo.c index 90ccde72133..10eaa6710d4 100644 --- a/source4/torture/raw/setfileinfo.c +++ b/source4/torture/raw/setfileinfo.c @@ -21,6 +21,7 @@ #include "torture/torture.h" #include "system/time.h" #include "libcli/raw/libcliraw.h" +#include "libcli/raw/raw_proto.h" #include "libcli/libcli.h" #include "torture/util.h" #include "torture/raw/proto.h" diff --git a/source4/torture/raw/unlink.c b/source4/torture/raw/unlink.c index d34bbeb9a56..ddddeba41be 100644 --- a/source4/torture/raw/unlink.c +++ b/source4/torture/raw/unlink.c @@ -21,6 +21,7 @@ #include "torture/torture.h" #include "system/filesys.h" #include "libcli/raw/libcliraw.h" +#include "libcli/raw/raw_proto.h" #include "libcli/libcli.h" #include "torture/util.h" #include "param/param.h" diff --git a/source4/torture/raw/write.c b/source4/torture/raw/write.c index 98a0dde8c7f..5d3628ca86f 100644 --- a/source4/torture/raw/write.c +++ b/source4/torture/raw/write.c @@ -21,6 +21,7 @@ #include "includes.h" #include "torture/torture.h" #include "libcli/raw/libcliraw.h" +#include "libcli/raw/raw_proto.h" #include "system/time.h" #include "system/filesys.h" #include "libcli/libcli.h" diff --git a/source4/torture/rpc/autoidl.c b/source4/torture/rpc/autoidl.c index 71965397f60..5ae0201855f 100644 --- a/source4/torture/rpc/autoidl.c +++ b/source4/torture/rpc/autoidl.c @@ -25,6 +25,7 @@ #include "librpc/gen_ndr/ndr_misc.h" #include "librpc/ndr/ndr_table.h" #include "torture/rpc/rpc.h" +#include "librpc/rpc/dcerpc_proto.h" #if 1 diff --git a/source4/torture/rpc/countcalls.c b/source4/torture/rpc/countcalls.c index f70649d5580..205ee1ec861 100644 --- a/source4/torture/rpc/countcalls.c +++ b/source4/torture/rpc/countcalls.c @@ -26,6 +26,7 @@ #include "librpc/ndr/ndr_table.h" #include "torture/rpc/rpc.h" #include "param/param.h" +#include "librpc/rpc/dcerpc_proto.h" diff --git a/source4/torture/rpc/epmapper.c b/source4/torture/rpc/epmapper.c index 830b77aed97..708d46a5dcb 100644 --- a/source4/torture/rpc/epmapper.c +++ b/source4/torture/rpc/epmapper.c @@ -22,6 +22,7 @@ #include "torture/torture.h" #include "librpc/gen_ndr/ndr_epmapper_c.h" #include "librpc/ndr/ndr_table.h" +#include "librpc/rpc/dcerpc_proto.h" #include "torture/rpc/rpc.h" diff --git a/source4/torture/rpc/mgmt.c b/source4/torture/rpc/mgmt.c index d4b5fa9c6fe..fed432f31c5 100644 --- a/source4/torture/rpc/mgmt.c +++ b/source4/torture/rpc/mgmt.c @@ -25,6 +25,7 @@ #include "librpc/ndr/ndr_table.h" #include "torture/rpc/rpc.h" #include "param/param.h" +#include "librpc/rpc/dcerpc_proto.h" /* diff --git a/source4/torture/rpc/rpc.h b/source4/torture/rpc/rpc.h index 385c734d9c2..d0a07277877 100644 --- a/source4/torture/rpc/rpc.h +++ b/source4/torture/rpc/rpc.h @@ -42,6 +42,48 @@ struct torture_rpc_tcase_data { struct cli_credentials *credentials; }; +NTSTATUS torture_rpc_connection(struct torture_context *tctx, + struct dcerpc_pipe **p, + const struct ndr_interface_table *table); + +struct test_join *torture_join_domain(struct torture_context *tctx, + const char *machine_name, + uint32_t acct_flags, + struct cli_credentials **machine_credentials); +const struct dom_sid *torture_join_sid(struct test_join *join); +void torture_leave_domain(struct test_join *join); +struct torture_rpc_tcase *torture_suite_add_rpc_iface_tcase(struct torture_suite *suite, + const char *name, + const struct ndr_interface_table *table); + +struct torture_test *torture_rpc_tcase_add_test( + struct torture_rpc_tcase *tcase, + const char *name, + bool (*fn) (struct torture_context *, struct dcerpc_pipe *)); +struct torture_rpc_tcase *torture_suite_add_anon_rpc_iface_tcase(struct torture_suite *suite, + const char *name, + const struct ndr_interface_table *table); + +struct torture_test *torture_rpc_tcase_add_test_ex( + struct torture_rpc_tcase *tcase, + const char *name, + bool (*fn) (struct torture_context *, struct dcerpc_pipe *, + void *), + void *userdata); +struct torture_rpc_tcase *torture_suite_add_machine_rpc_iface_tcase( + struct torture_suite *suite, + const char *name, + const struct ndr_interface_table *table, + const char *machine_name); +struct torture_test *torture_rpc_tcase_add_test_creds( + struct torture_rpc_tcase *tcase, + const char *name, + bool (*fn) (struct torture_context *, struct dcerpc_pipe *, struct cli_credentials *)); +bool torture_suite_init_rpc_tcase(struct torture_suite *suite, + struct torture_rpc_tcase *tcase, + const char *name, + const struct ndr_interface_table *table); + #endif /* __TORTURE_RPC_H__ */ diff --git a/source4/torture/rpc/samba3rpc.c b/source4/torture/rpc/samba3rpc.c index 204a9f2865c..8eb1f54b4fd 100644 --- a/source4/torture/rpc/samba3rpc.c +++ b/source4/torture/rpc/samba3rpc.c @@ -21,6 +21,7 @@ #include "includes.h" #include "libcli/raw/libcliraw.h" +#include "libcli/raw/raw_proto.h" #include "libcli/rap/rap.h" #include "torture/torture.h" #include "torture/util.h" diff --git a/source4/torture/rpc/samlogon.c b/source4/torture/rpc/samlogon.c index aba71477168..24b2511bc75 100644 --- a/source4/torture/rpc/samlogon.c +++ b/source4/torture/rpc/samlogon.c @@ -30,6 +30,7 @@ #include "lib/cmdline/popt_common.h" #include "torture/rpc/rpc.h" #include "auth/gensec/schannel_proto.h" +#include "auth/gensec/gensec.h" #include "libcli/auth/libcli_auth.h" #include "param/param.h" diff --git a/source4/torture/rpc/samsync.c b/source4/torture/rpc/samsync.c index 865ebf9fd21..3b152d92aa7 100644 --- a/source4/torture/rpc/samsync.c +++ b/source4/torture/rpc/samsync.c @@ -29,6 +29,7 @@ #include "system/time.h" #include "torture/rpc/rpc.h" #include "auth/gensec/schannel_proto.h" +#include "auth/gensec/gensec.h" #include "libcli/auth/libcli_auth.h" #include "libcli/security/security.h" #include "librpc/gen_ndr/ndr_netlogon.h" diff --git a/source4/torture/rpc/scanner.c b/source4/torture/rpc/scanner.c index 03a2c9fd078..b761f406ec2 100644 --- a/source4/torture/rpc/scanner.c +++ b/source4/torture/rpc/scanner.c @@ -25,6 +25,7 @@ #include "librpc/ndr/ndr_table.h" #include "torture/rpc/rpc.h" #include "param/param.h" +#include "librpc/rpc/dcerpc_proto.h" /* work out how many calls there are for an interface diff --git a/source4/torture/rpc/schannel.c b/source4/torture/rpc/schannel.c index 5a91366980b..19b871f9c09 100644 --- a/source4/torture/rpc/schannel.c +++ b/source4/torture/rpc/schannel.c @@ -31,6 +31,8 @@ #include "libcli/security/security.h" #include "system/filesys.h" #include "param/param.h" +#include "librpc/rpc/dcerpc_proto.h" +#include "auth/gensec/gensec.h" #define TEST_MACHINE_NAME "schannel" diff --git a/source4/torture/rpc/spoolss_notify.c b/source4/torture/rpc/spoolss_notify.c index 32e7b523a46..19cff53d847 100644 --- a/source4/torture/rpc/spoolss_notify.c +++ b/source4/torture/rpc/spoolss_notify.c @@ -28,6 +28,7 @@ #include "lib/events/events.h" #include "smbd/process_model.h" #include "smb_server/smb_server.h" +#include "librpc/rpc/dcerpc_proto.h" #include "lib/socket/netif.h" #include "util/dlinklist.h" #include "ntvfs/ntvfs.h" diff --git a/source4/torture/smb2/smb2.c b/source4/torture/smb2/smb2.c index f234700cb8f..d07611264bc 100644 --- a/source4/torture/smb2/smb2.c +++ b/source4/torture/smb2/smb2.c @@ -46,7 +46,7 @@ static bool wrap_simple_1smb2_test(struct torture_context *torture_ctx, return ret; } -_PUBLIC_ struct torture_test *torture_suite_add_1smb2_test(struct torture_suite *suite, +struct torture_test *torture_suite_add_1smb2_test(struct torture_suite *suite, const char *name, bool (*run) (struct torture_context *, struct smb2_tree *)) diff --git a/source4/torture/torture.c b/source4/torture/torture.c index 23b8ee31436..ea8efaa8c37 100644 --- a/source4/torture/torture.c +++ b/source4/torture/torture.c @@ -46,7 +46,7 @@ bool torture_register_suite(struct torture_suite *suite) } -int torture_init(void) +_PUBLIC_ int torture_init(void) { init_module_fn static_init[] = { STATIC_torture_MODULES }; init_module_fn *shared_init = load_samba_modules(NULL, cmdline_lp_ctx, "torture"); diff --git a/source4/torture/torture.h b/source4/torture/torture.h index e191fb36297..a5a6bc1cbf2 100644 --- a/source4/torture/torture.h +++ b/source4/torture/torture.h @@ -34,7 +34,8 @@ extern int torture_failures; extern int torture_numasync; struct torture_test; - -#include "torture/proto.h" +int torture_init(void); +bool torture_register_suite(struct torture_suite *suite); +#include "torture/ui.h" #endif /* __TORTURE_H__ */ diff --git a/source4/torture/ui.h b/source4/torture/ui.h index 503a4f4decd..a90af21d4ac 100644 --- a/source4/torture/ui.h +++ b/source4/torture/ui.h @@ -368,5 +368,21 @@ bool torture_setting_bool(struct torture_context *test, struct torture_suite *torture_find_suite(struct torture_suite *parent, const char *name); +NTSTATUS torture_temp_dir(struct torture_context *tctx, + const char *prefix, + char **tempdir); + +struct torture_test *torture_tcase_add_simple_test(struct torture_tcase *tcase, + const char *name, + bool (*run) (struct torture_context *test, void *tcase_data)); + + +bool torture_suite_init_tcase(struct torture_suite *suite, + struct torture_tcase *tcase, + const char *name); + +struct torture_context *torture_context_init(TALLOC_CTX *mem_ctx, + const struct torture_ui_ops *ui_ops); + #endif /* __TORTURE_UI_H__ */ diff --git a/source4/torture/unix/whoami.c b/source4/torture/unix/whoami.c index 3203f91bc03..a1333ac5bdf 100644 --- a/source4/torture/unix/whoami.c +++ b/source4/torture/unix/whoami.c @@ -22,6 +22,7 @@ #include "torture/basic/proto.h" #include "libcli/libcli.h" #include "libcli/raw/interfaces.h" +#include "libcli/raw/raw_proto.h" #include "lib/cmdline/popt_common.h" #include "auth/credentials/credentials.h" #include "param/param.h" diff --git a/source4/torture/util_provision.c b/source4/torture/util_provision.c index d214fc120f3..cce8e18fdcc 100644 --- a/source4/torture/util_provision.c +++ b/source4/torture/util_provision.c @@ -23,6 +23,7 @@ #include "torture/torture.h" #include "libcli/raw/libcliraw.h" #include "torture/util.h" +#include "librpc/ndr/libndr.h" #include "param/param.h" #include <Python.h> diff --git a/source4/torture/util_smb.c b/source4/torture/util_smb.c index ba62f3789c1..513070500ed 100644 --- a/source4/torture/util_smb.c +++ b/source4/torture/util_smb.c @@ -21,6 +21,7 @@ #include "includes.h" #include "lib/cmdline/popt_common.h" #include "libcli/raw/libcliraw.h" +#include "libcli/raw/raw_proto.h" #include "libcli/raw/ioctl.h" #include "libcli/libcli.h" #include "system/filesys.h" |