summaryrefslogtreecommitdiff
path: root/source4/torture
diff options
context:
space:
mode:
Diffstat (limited to 'source4/torture')
-rw-r--r--source4/torture/basic/scanner.c7
-rw-r--r--source4/torture/libnet/utils.c1
-rw-r--r--source4/torture/raw/eas.c1
-rw-r--r--source4/torture/raw/lookuprate.c1
-rw-r--r--source4/torture/raw/mkdir.c1
-rw-r--r--source4/torture/raw/notify.c1
-rw-r--r--source4/torture/raw/offline.c1
-rw-r--r--source4/torture/raw/open.c1
-rwxr-xr-xsource4/torture/raw/pingpong.c1
-rw-r--r--source4/torture/raw/read.c1
-rw-r--r--source4/torture/raw/unlink.c1
-rw-r--r--source4/torture/rpc/bench.c1
-rw-r--r--source4/torture/rpc/drsuapi_cracknames.c1
-rw-r--r--source4/torture/rpc/samr.c1
-rw-r--r--source4/torture/smb2/connect.c1
-rw-r--r--source4/torture/smb2/create.c1
-rw-r--r--source4/torture/smb2/getinfo.c2
-rw-r--r--source4/torture/smb2/oplocks.c1
-rw-r--r--source4/torture/smb2/persistent_handles.c1
19 files changed, 4 insertions, 22 deletions
diff --git a/source4/torture/basic/scanner.c b/source4/torture/basic/scanner.c
index 7f88662baa..a6173e4501 100644
--- a/source4/torture/basic/scanner.c
+++ b/source4/torture/basic/scanner.c
@@ -548,6 +548,7 @@ bool torture_nttrans_scan(struct torture_context *torture,
{
int op, level;
const char *fname = "\\scanner.dat";
+ struct smb_iconv_convenience *iconv_convenience = lp_iconv_convenience(torture->lp_ctx);
int fnum, dnum;
fnum = smbcli_open(cli->tree, fname, O_RDWR | O_CREAT | O_TRUNC,
@@ -557,17 +558,17 @@ bool torture_nttrans_scan(struct torture_context *torture,
for (op=OP_MIN; op<=OP_MAX; op++) {
printf("Scanning op=%d\n", op);
for (level = 0; level <= 50; level++) {
- scan_nttrans(lp_iconv_convenience(torture->lp_ctx),
+ scan_nttrans(iconv_convenience,
cli, op, level, fnum, dnum, fname);
}
for (level = 0x100; level <= 0x130; level++) {
- scan_nttrans(lp_iconv_convenience(torture->lp_ctx),
+ scan_nttrans(iconv_convenience,
cli, op, level, fnum, dnum, fname);
}
for (level = 1000; level < 1050; level++) {
- scan_nttrans(lp_iconv_convenience(torture->lp_ctx),
+ scan_nttrans(iconv_convenience,
cli, op, level, fnum, dnum, fname);
}
}
diff --git a/source4/torture/libnet/utils.c b/source4/torture/libnet/utils.c
index 4a55eaa56c..54c5f2c29c 100644
--- a/source4/torture/libnet/utils.c
+++ b/source4/torture/libnet/utils.c
@@ -26,7 +26,6 @@
#include "torture/rpc/rpc.h"
#include "libnet/libnet.h"
#include "librpc/gen_ndr/ndr_samr_c.h"
-#include "param/param.h"
#include "torture/libnet/utils.h"
diff --git a/source4/torture/raw/eas.c b/source4/torture/raw/eas.c
index bc4473b17a..49a81dd534 100644
--- a/source4/torture/raw/eas.c
+++ b/source4/torture/raw/eas.c
@@ -25,7 +25,6 @@
#include "libcli/raw/libcliraw.h"
#include "libcli/libcli.h"
#include "torture/util.h"
-#include "param/param.h"
#define BASEDIR "\\testeas"
diff --git a/source4/torture/raw/lookuprate.c b/source4/torture/raw/lookuprate.c
index 782cb1b31b..f7ba004ae5 100644
--- a/source4/torture/raw/lookuprate.c
+++ b/source4/torture/raw/lookuprate.c
@@ -18,7 +18,6 @@
*/
#include "includes.h"
-#include "param/param.h"
#include "system/filesys.h"
#include "torture/smbtorture.h"
#include "torture/basic/proto.h"
diff --git a/source4/torture/raw/mkdir.c b/source4/torture/raw/mkdir.c
index cea959347d..a81aacdaa4 100644
--- a/source4/torture/raw/mkdir.c
+++ b/source4/torture/raw/mkdir.c
@@ -23,7 +23,6 @@
#include "libcli/raw/raw_proto.h"
#include "libcli/libcli.h"
#include "torture/util.h"
-#include "param/param.h"
#define BASEDIR "\\mkdirtest"
diff --git a/source4/torture/raw/notify.c b/source4/torture/raw/notify.c
index d7541b7c71..82f7d18323 100644
--- a/source4/torture/raw/notify.c
+++ b/source4/torture/raw/notify.c
@@ -24,7 +24,6 @@
#include "libcli/libcli.h"
#include "system/filesys.h"
#include "torture/util.h"
-#include "param/param.h"
#define BASEDIR "\\test_notify"
diff --git a/source4/torture/raw/offline.c b/source4/torture/raw/offline.c
index f2f0bf5d27..34d87f1623 100644
--- a/source4/torture/raw/offline.c
+++ b/source4/torture/raw/offline.c
@@ -33,7 +33,6 @@
#include "libcli/composite/composite.h"
#include "libcli/smb_composite/smb_composite.h"
#include "libcli/resolve/resolve.h"
-#include "param/param.h"
#define BASEDIR "\\testoffline"
diff --git a/source4/torture/raw/open.c b/source4/torture/raw/open.c
index dd5ef0d0b9..ef0fa5138a 100644
--- a/source4/torture/raw/open.c
+++ b/source4/torture/raw/open.c
@@ -29,7 +29,6 @@
#include "torture/util.h"
#include "auth/credentials/credentials.h"
#include "lib/cmdline/popt_common.h"
-#include "param/param.h"
/* enum for whether reads/writes are possible on a file */
enum rdwr_mode {RDWR_NONE, RDWR_RDONLY, RDWR_WRONLY, RDWR_RDWR};
diff --git a/source4/torture/raw/pingpong.c b/source4/torture/raw/pingpong.c
index ca56f190a9..a19b330dbd 100755
--- a/source4/torture/raw/pingpong.c
+++ b/source4/torture/raw/pingpong.c
@@ -50,7 +50,6 @@
#include "system/filesys.h"
#include "libcli/libcli.h"
#include "torture/util.h"
-#include "param/param.h"
static void lock_byte(struct smbcli_state *cli, int fd, int offset, int lock_timeout)
{
diff --git a/source4/torture/raw/read.c b/source4/torture/raw/read.c
index ada9b1f432..977ac6b8cb 100644
--- a/source4/torture/raw/read.c
+++ b/source4/torture/raw/read.c
@@ -25,7 +25,6 @@
#include "system/filesys.h"
#include "libcli/libcli.h"
#include "torture/util.h"
-#include "param/param.h"
#define CHECK_STATUS(status, correct) do { \
if (!NT_STATUS_EQUAL(status, correct)) { \
diff --git a/source4/torture/raw/unlink.c b/source4/torture/raw/unlink.c
index ddddeba41b..1058a58d9d 100644
--- a/source4/torture/raw/unlink.c
+++ b/source4/torture/raw/unlink.c
@@ -24,7 +24,6 @@
#include "libcli/raw/raw_proto.h"
#include "libcli/libcli.h"
#include "torture/util.h"
-#include "param/param.h"
#define CHECK_STATUS(status, correct) do { \
if (!NT_STATUS_EQUAL(status, correct)) { \
diff --git a/source4/torture/rpc/bench.c b/source4/torture/rpc/bench.c
index 2ae92332f8..cacc1d3baa 100644
--- a/source4/torture/rpc/bench.c
+++ b/source4/torture/rpc/bench.c
@@ -23,7 +23,6 @@
#include "torture/torture.h"
#include "librpc/gen_ndr/ndr_srvsvc_c.h"
#include "torture/rpc/rpc.h"
-#include "param/param.h"
/**************************/
/* srvsvc_NetShare */
diff --git a/source4/torture/rpc/drsuapi_cracknames.c b/source4/torture/rpc/drsuapi_cracknames.c
index dabd4125c7..65a15c97e0 100644
--- a/source4/torture/rpc/drsuapi_cracknames.c
+++ b/source4/torture/rpc/drsuapi_cracknames.c
@@ -27,7 +27,6 @@
#include "torture/rpc/rpc.h"
#include "ldb/include/ldb.h"
#include "libcli/security/security.h"
-#include "param/param.h"
static bool test_DsCrackNamesMatrix(struct dcerpc_pipe *p, TALLOC_CTX *mem_ctx,
struct DsPrivate *priv, const char *dn,
diff --git a/source4/torture/rpc/samr.c b/source4/torture/rpc/samr.c
index 1f19b8ec3f..7e9b7e119d 100644
--- a/source4/torture/rpc/samr.c
+++ b/source4/torture/rpc/samr.c
@@ -28,7 +28,6 @@
#include "libcli/auth/libcli_auth.h"
#include "libcli/security/security.h"
#include "torture/rpc/rpc.h"
-#include "param/param.h"
#define TEST_ACCOUNT_NAME "samrtorturetest"
#define TEST_ALIASNAME "samrtorturetestalias"
diff --git a/source4/torture/smb2/connect.c b/source4/torture/smb2/connect.c
index e77e32ff7a..01ffffa484 100644
--- a/source4/torture/smb2/connect.c
+++ b/source4/torture/smb2/connect.c
@@ -25,7 +25,6 @@
#include "libcli/smb2/smb2_calls.h"
#include "torture/torture.h"
#include "torture/smb2/proto.h"
-#include "param/param.h"
/*
send a close
diff --git a/source4/torture/smb2/create.c b/source4/torture/smb2/create.c
index 124e244151..6d898a128c 100644
--- a/source4/torture/smb2/create.c
+++ b/source4/torture/smb2/create.c
@@ -24,7 +24,6 @@
#include "libcli/smb2/smb2_calls.h"
#include "torture/torture.h"
#include "torture/smb2/proto.h"
-#include "param/param.h"
#include "librpc/gen_ndr/ndr_security.h"
#include "libcli/security/security.h"
diff --git a/source4/torture/smb2/getinfo.c b/source4/torture/smb2/getinfo.c
index 5b35d7e693..c4ab31f4cf 100644
--- a/source4/torture/smb2/getinfo.c
+++ b/source4/torture/smb2/getinfo.c
@@ -26,8 +26,6 @@
#include "torture/torture.h"
#include "torture/smb2/proto.h"
-#include "param/param.h"
-
static struct {
const char *name;
uint16_t level;
diff --git a/source4/torture/smb2/oplocks.c b/source4/torture/smb2/oplocks.c
index 9a06ae1f19..3fee0b4ab6 100644
--- a/source4/torture/smb2/oplocks.c
+++ b/source4/torture/smb2/oplocks.c
@@ -25,7 +25,6 @@
#include "libcli/smb2/smb2_calls.h"
#include "torture/torture.h"
#include "torture/smb2/proto.h"
-#include "param/param.h"
#define CHECK_VAL(v, correct) do { \
if ((v) != (correct)) { \
diff --git a/source4/torture/smb2/persistent_handles.c b/source4/torture/smb2/persistent_handles.c
index 249ddd1733..05c5dbbe85 100644
--- a/source4/torture/smb2/persistent_handles.c
+++ b/source4/torture/smb2/persistent_handles.c
@@ -25,7 +25,6 @@
#include "libcli/smb2/smb2_calls.h"
#include "torture/torture.h"
#include "torture/smb2/proto.h"
-#include "param/param.h"
#define CHECK_VAL(v, correct) do { \
if ((v) != (correct)) { \
generated by cgit (git 2.34.1) at 2024-06-28 19:56:01 +0000