diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-03 15:53:07 +0100 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:47:27 +0100 |
commit | 0a2f1a46a02d2c9497d05d7e534829dc6e9430dc (patch) | |
tree | 5647b3b0b98f97abc84a47a19613938345e0384c /source4/torture/basic | |
parent | 53ae9bc9f6f66578948c3995073bdc1f1acae0f1 (diff) | |
download | samba-0a2f1a46a02d2c9497d05d7e534829dc6e9430dc.tar.gz samba-0a2f1a46a02d2c9497d05d7e534829dc6e9430dc.tar.xz samba-0a2f1a46a02d2c9497d05d7e534829dc6e9430dc.zip |
r26249: Remove a couple more uses of global_loadparm.
(This used to be commit 80a61200508a00d5b16a3e748ce92d54b9fefcd2)
Diffstat (limited to 'source4/torture/basic')
-rw-r--r-- | source4/torture/basic/base.c | 6 | ||||
-rw-r--r-- | source4/torture/basic/delete.c | 8 | ||||
-rw-r--r-- | source4/torture/basic/disconnect.c | 6 | ||||
-rw-r--r-- | source4/torture/basic/misc.c | 2 | ||||
-rw-r--r-- | source4/torture/basic/scanner.c | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c index 9a5616e2741..3e6c16f0885 100644 --- a/source4/torture/basic/base.c +++ b/source4/torture/basic/base.c @@ -370,7 +370,7 @@ static bool run_negprot_nowait(struct torture_context *tctx) } torture_comment(tctx, "Opening secondary connection\n"); - if (!torture_open_connection(&cli2, 1)) { + if (!torture_open_connection(&cli2, tctx, 1)) { torture_comment(tctx, "Failed to open secondary connection\n"); correct = false; } @@ -1450,7 +1450,7 @@ static bool torture_samba3_errorpaths(struct torture_context *tctx) goto fail; } - if (!torture_open_connection(&cli_nt, 0)) { + if (!torture_open_connection(&cli_nt, tctx, 0)) { goto fail; } @@ -1459,7 +1459,7 @@ static bool torture_samba3_errorpaths(struct torture_context *tctx) goto fail; } - if (!torture_open_connection(&cli_dos, 1)) { + if (!torture_open_connection(&cli_dos, tctx, 1)) { goto fail; } diff --git a/source4/torture/basic/delete.c b/source4/torture/basic/delete.c index 38528cd8456..8b84880c06c 100644 --- a/source4/torture/basic/delete.c +++ b/source4/torture/basic/delete.c @@ -1373,10 +1373,10 @@ static bool deltest21(struct torture_context *tctx) struct smbcli_state *cli2; bool correct = true; - if (!torture_open_connection(&cli1, 0)) + if (!torture_open_connection(&cli1, tctx, 0)) return false; - if (!torture_open_connection(&cli2, 1)) + if (!torture_open_connection(&cli2, tctx, 1)) return false; del_clean_area(cli1, cli2); @@ -1404,7 +1404,7 @@ static bool deltest21(struct torture_context *tctx) fnum1 = -1; - if (!torture_open_connection(&cli1, 0)) { + if (!torture_open_connection(&cli1, tctx, 0)) { return false; } @@ -1440,7 +1440,7 @@ static bool deltest22(struct torture_context *tctx) struct smbcli_state *cli1; bool correct = true; - if (!torture_open_connection(&cli1, 0)) + if (!torture_open_connection(&cli1, tctx, 0)) return false; smbcli_deltree(cli1->tree, dname); diff --git a/source4/torture/basic/disconnect.c b/source4/torture/basic/disconnect.c index cb77bfe984d..09f54ed6a70 100644 --- a/source4/torture/basic/disconnect.c +++ b/source4/torture/basic/disconnect.c @@ -136,7 +136,7 @@ bool torture_disconnect(struct torture_context *torture) mem_ctx = talloc_init("torture_raw_mux"); - if (!torture_open_connection(&cli, 0)) { + if (!torture_open_connection(&cli, torture, 0)) { return false; } @@ -146,12 +146,12 @@ bool torture_disconnect(struct torture_context *torture) for (i=0;i<torture_numops;i++) { ret &= test_disconnect_lock(cli, mem_ctx); - if (!torture_open_connection(&cli, 0)) { + if (!torture_open_connection(&cli, torture, 0)) { return false; } ret &= test_disconnect_open(cli, mem_ctx); - if (!torture_open_connection(&cli, 0)) { + if (!torture_open_connection(&cli, torture, 0)) { return false; } diff --git a/source4/torture/basic/misc.c b/source4/torture/basic/misc.c index 46f74ee1b10..e9a41e82999 100644 --- a/source4/torture/basic/misc.c +++ b/source4/torture/basic/misc.c @@ -194,7 +194,7 @@ bool torture_holdcon(struct torture_context *tctx) cli = malloc_array_p(struct smbcli_state *, torture_numops); for (i=0;i<torture_numops;i++) { - if (!torture_open_connection(&cli[i], i)) { + if (!torture_open_connection(&cli[i], tctx, i)) { return false; } if (torture_setting_bool(tctx, "progress", true)) { diff --git a/source4/torture/basic/scanner.c b/source4/torture/basic/scanner.c index dd596c9ee36..f97bb404c03 100644 --- a/source4/torture/basic/scanner.c +++ b/source4/torture/basic/scanner.c @@ -515,7 +515,7 @@ bool torture_smb_scan(struct torture_context *torture) for (op=0x0;op<=0xFF;op++) { if (op == SMBreadbraw) continue; - if (!torture_open_connection(&cli, 0)) { + if (!torture_open_connection(&cli, torture, 0)) { return false; } |