From 8f8c56bfbcbfe8f80afb09eb1d481a108b252bee Mon Sep 17 00:00:00 2001 From: Andrew Kroeger Date: Fri, 28 Mar 2008 01:08:49 -0500 Subject: Convert some more files to GPLv3. (This used to be commit ebe5e8399422eb7e2ff4deb546338823e2718907) --- source4/torture/rpc/dfs.c | 2 +- source4/torture/rpc/frsapi.c | 2 +- source4/torture/rpc/spoolss_notify.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'source4/torture') diff --git a/source4/torture/rpc/dfs.c b/source4/torture/rpc/dfs.c index dc2601d86e..9cfdd80578 100644 --- a/source4/torture/rpc/dfs.c +++ b/source4/torture/rpc/dfs.c @@ -6,7 +6,7 @@ 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 + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, diff --git a/source4/torture/rpc/frsapi.c b/source4/torture/rpc/frsapi.c index a39c91f853..c8e421a674 100644 --- a/source4/torture/rpc/frsapi.c +++ b/source4/torture/rpc/frsapi.c @@ -6,7 +6,7 @@ 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 + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, diff --git a/source4/torture/rpc/spoolss_notify.c b/source4/torture/rpc/spoolss_notify.c index 96db7d1ec5..32e7b523a4 100644 --- a/source4/torture/rpc/spoolss_notify.c +++ b/source4/torture/rpc/spoolss_notify.c @@ -6,7 +6,7 @@ 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 + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, -- cgit From 52013b846a7b97022b8368b51734e7a960e704f4 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 28 Mar 2008 09:40:08 +0100 Subject: torture: fix compiler warnings metze (This used to be commit 326ae6ce9c8a6f5800d5ecb4a2bfdfc32336797d) --- source4/torture/util_provision.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'source4/torture') diff --git a/source4/torture/util_provision.c b/source4/torture/util_provision.c index d7c8f479e6..d214fc120f 100644 --- a/source4/torture/util_provision.c +++ b/source4/torture/util_provision.c @@ -20,6 +20,8 @@ #include "includes.h" #include "auth/auth.h" #include "lib/ldb_wrap.h" +#include "torture/torture.h" +#include "libcli/raw/libcliraw.h" #include "torture/util.h" #include "param/param.h" @@ -27,12 +29,9 @@ #include "scripting/python/modules.h" NTSTATUS provision_bare(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, - struct provision_settings *settings) + struct provision_settings *settings) { - bool ok; PyObject *provision_mod, *provision_dict, *provision_fn, *result, *parameters; - struct ldb_context *ldb; - char *sam_ldb_path; DEBUG(0,("Provision for Become-DC test using python\n")); -- cgit From f41b9a9dde0dcad17e3a137537548f9bd9ab3901 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Tue, 1 Apr 2008 15:08:30 +0200 Subject: Rename libsamba-config to libsamba-hostconfig. (This used to be commit c46b7e90e347da76156ddcae4866adb88e9fec21) --- source4/torture/config.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'source4/torture') diff --git a/source4/torture/config.mk b/source4/torture/config.mk index e35a26e49f..1d09d74f99 100644 --- a/source4/torture/config.mk +++ b/source4/torture/config.mk @@ -8,7 +8,7 @@ OBJ_FILES = \ torture.o \ ui.o PUBLIC_DEPENDENCIES = \ - LIBSAMBA-CONFIG \ + LIBSAMBA-HOSTCONFIG \ LIBSAMBA-UTIL \ LIBTALLOC \ LIBPOPT @@ -327,7 +327,7 @@ INSTALLDIR = BINDIR OBJ_FILES = \ gentest.o PRIVATE_DEPENDENCIES = \ - LIBSAMBA-CONFIG \ + LIBSAMBA-HOSTCONFIG \ LIBSAMBA-UTIL \ LIBPOPT \ POPT_SAMBA \ @@ -346,7 +346,7 @@ INSTALLDIR = BINDIR OBJ_FILES = \ masktest.o PRIVATE_DEPENDENCIES = \ - LIBSAMBA-CONFIG \ + LIBSAMBA-HOSTCONFIG \ LIBSAMBA-UTIL \ LIBPOPT \ POPT_SAMBA \ @@ -369,7 +369,7 @@ PRIVATE_DEPENDENCIES = \ POPT_CREDENTIALS \ LIBSAMBA-UTIL \ LIBCLI_SMB \ - LIBSAMBA-CONFIG + LIBSAMBA-HOSTCONFIG # End BINARY locktest ################################# -- cgit From afe3e8172ddaa5e4aa811faceecda4f943d6e2ef Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 2 Apr 2008 04:53:27 +0200 Subject: Install public header files again and include required prototypes. (This used to be commit 47ffbbf67435904754469544390b67d34c958343) --- source4/torture/auth/ntlmssp.c | 3 ++- source4/torture/auth/pac.c | 3 ++- source4/torture/basic/aliases.c | 1 + source4/torture/basic/base.c | 1 + source4/torture/basic/delaywrite.c | 1 + source4/torture/basic/delete.c | 1 + source4/torture/basic/disconnect.c | 1 + source4/torture/basic/misc.c | 1 + source4/torture/basic/scanner.c | 1 + source4/torture/basic/secleak.c | 2 ++ source4/torture/ldap/common.c | 6 +++--- source4/torture/rap/rap.c | 2 +- source4/torture/raw/chkpath.c | 1 + source4/torture/raw/close.c | 1 + source4/torture/raw/context.c | 1 + source4/torture/raw/ioctl.c | 1 + source4/torture/raw/lock.c | 1 + source4/torture/raw/lockbench.c | 1 + source4/torture/raw/mkdir.c | 1 + source4/torture/raw/mux.c | 1 + source4/torture/raw/notify.c | 1 + source4/torture/raw/open.c | 1 + source4/torture/raw/openbench.c | 1 + source4/torture/raw/oplock.c | 1 + source4/torture/raw/qfileinfo.c | 1 + source4/torture/raw/read.c | 1 + source4/torture/raw/samba3misc.c | 1 + source4/torture/raw/search.c | 3 ++- source4/torture/raw/setfileinfo.c | 1 + source4/torture/raw/unlink.c | 1 + source4/torture/raw/write.c | 1 + source4/torture/rpc/autoidl.c | 1 + source4/torture/rpc/countcalls.c | 1 + source4/torture/rpc/epmapper.c | 1 + source4/torture/rpc/mgmt.c | 1 + source4/torture/rpc/rpc.h | 42 ++++++++++++++++++++++++++++++++++++ source4/torture/rpc/samba3rpc.c | 1 + source4/torture/rpc/samlogon.c | 1 + source4/torture/rpc/samsync.c | 1 + source4/torture/rpc/scanner.c | 1 + source4/torture/rpc/schannel.c | 2 ++ source4/torture/rpc/spoolss_notify.c | 1 + source4/torture/smb2/smb2.c | 2 +- source4/torture/torture.c | 2 +- source4/torture/torture.h | 5 +++-- source4/torture/ui.h | 16 ++++++++++++++ source4/torture/unix/whoami.c | 1 + source4/torture/util_provision.c | 1 + source4/torture/util_smb.c | 1 + 49 files changed, 114 insertions(+), 11 deletions(-) (limited to 'source4/torture') diff --git a/source4/torture/auth/ntlmssp.c b/source4/torture/auth/ntlmssp.c index f2cc0a9182..9366de986a 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 68bbd3483a..7fdd7e58bf 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 660009704b..89146de99d 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 66f9359744..ac71d14116 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 8644c656eb..e3d63c09ec 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 8b84880c06..b71c85aeb8 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 09f54ed6a7..89e05d6839 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 d991f117cd..188fc1bc69 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 d462f97da4..6ccd4ba1cc 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 d0c048425d..4caeee72a4 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 11b11dcc00..65b02ed5e8 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 edc74ee23e..4b5f4b582c 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 7fd74e3cbe..2ed83d308c 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 6f139f8530..01175836df 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 20135d2fa9..15e736fff5 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 c4dd4c5bf2..4cb366f807 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 6eb43bd538..cd8d606795 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 16e9f0ec75..86030c538a 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 93e94150d7..cea959347d 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 846a9787cb..5b5db3a557 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 2967abdbe3..25c91eb88b 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 76bc0ca53d..d28a8bd14e 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 e8b2f56813..a5b1434a47 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 8b2e4fb177..1927a0f027 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 65d803882c..c7673be526 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 b052da2d69..c8420c279e 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 749b10cc07..15a7f6c4a3 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 725ed261aa..2a6aef20b5 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 90ccde7213..10eaa6710d 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 d34bbeb9a5..ddddeba41b 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 98a0dde8c7..5d3628ca86 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 71965397f6..5ae0201855 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 f70649d558..205ee1ec86 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 830b77aed9..708d46a5dc 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 d4b5fa9c6f..fed432f31c 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 385c734d9c..d0a0727787 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 204a9f2865..8eb1f54b4f 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 aba7147716..24b2511bc7 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 865ebf9fd2..3b152d92aa 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 03a2c9fd07..b761f406ec 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 5a91366980..19b871f9c0 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 32e7b523a4..19cff53d84 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 f234700cb8..d07611264b 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 23b8ee3143..ea8efaa8c3 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 e191fb3629..a5a6bc1cbf 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 503a4f4dec..a90af21d4a 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 3203f91bc0..a1333ac5bd 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 d214fc120f..cce8e18fdc 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 diff --git a/source4/torture/util_smb.c b/source4/torture/util_smb.c index ba62f3789c..513070500e 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" -- cgit From 4924446969b0f2a02b799fa9b2af14172310ebf0 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Wed, 2 Apr 2008 14:10:16 +0200 Subject: Trim down installed headers some more. (This used to be commit 71aa38842c270d52d39b805bf7ce29e25e062024) --- source4/torture/torture.h | 2 +- source4/torture/ui.h | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'source4/torture') diff --git a/source4/torture/torture.h b/source4/torture/torture.h index a5a6bc1cbf..26ecdb567b 100644 --- a/source4/torture/torture.h +++ b/source4/torture/torture.h @@ -36,6 +36,6 @@ extern int torture_numasync; struct torture_test; 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 a90af21d4a..6645d9b012 100644 --- a/source4/torture/ui.h +++ b/source4/torture/ui.h @@ -384,5 +384,4 @@ bool torture_suite_init_tcase(struct torture_suite *suite, struct torture_context *torture_context_init(TALLOC_CTX *mem_ctx, const struct torture_ui_ops *ui_ops); - #endif /* __TORTURE_UI_H__ */ -- cgit