summaryrefslogtreecommitdiff
path: root/source4/torture
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-13 11:41:47 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:49:52 +0100
commitaa32619c5c910b9f5989f44de21621db5ef7c357 (patch)
tree670cd1bc010718f21ebbf346dcd6dafa9cd25d8a /source4/torture
parent45d349eb80ebd6b08a8bbcb66f657e89c3480a92 (diff)
downloadsamba-aa32619c5c910b9f5989f44de21621db5ef7c357.tar.gz
samba-aa32619c5c910b9f5989f44de21621db5ef7c357.tar.bz2
samba-aa32619c5c910b9f5989f44de21621db5ef7c357.zip
r26426: Remove uses of global_loadparm.
(This used to be commit e1d177c8c1101965479f7ade2270490cd6fae4f2)
Diffstat (limited to 'source4/torture')
-rw-r--r--source4/torture/nbt/winsbench.c2
-rw-r--r--source4/torture/rpc/spoolss_notify.c3
-rw-r--r--source4/torture/rpc/spoolss_win.c3
3 files changed, 5 insertions, 3 deletions
diff --git a/source4/torture/nbt/winsbench.c b/source4/torture/nbt/winsbench.c
index 5d7dbaf93e..1488c17757 100644
--- a/source4/torture/nbt/winsbench.c
+++ b/source4/torture/nbt/winsbench.c
@@ -139,7 +139,7 @@ static void generate_release(struct nbt_name_socket *nbtsock, struct wins_state
istate->state = state;
io.in.name = generate_name(tmp_ctx, idx);
- io.in.dest_port = lp_nbt_port(global_loadparm);
+ io.in.dest_port = state->wins_port;
io.in.dest_addr = state->wins_server;
io.in.address = state->my_ip;
io.in.nb_flags = NBT_NODE_H;
diff --git a/source4/torture/rpc/spoolss_notify.c b/source4/torture/rpc/spoolss_notify.c
index 559c50df45..0065101447 100644
--- a/source4/torture/rpc/spoolss_notify.c
+++ b/source4/torture/rpc/spoolss_notify.c
@@ -195,6 +195,8 @@ static bool test_RFFPCNEx(struct torture_context *tctx,
const char *address;
struct interface *ifaces;
+ ntvfs_init(tctx->lp_ctx);
+
ZERO_STRUCT(q);
q.in.printername = talloc_asprintf(tctx, "\\\\%s", dcerpc_server_name(p));
@@ -291,7 +293,6 @@ struct torture_suite *torture_rpc_spoolss_notify(TALLOC_CTX *mem_ctx)
struct torture_rpc_tcase *tcase = torture_suite_add_rpc_iface_tcase(suite,
"notify", &ndr_table_spoolss);
- ntvfs_init(global_loadparm);
torture_rpc_tcase_add_test(tcase, "testRFFPCNEx", test_RFFPCNEx);
return suite;
diff --git a/source4/torture/rpc/spoolss_win.c b/source4/torture/rpc/spoolss_win.c
index 8f70284ed3..1bc8aeb074 100644
--- a/source4/torture/rpc/spoolss_win.c
+++ b/source4/torture/rpc/spoolss_win.c
@@ -420,6 +420,8 @@ static bool test_WinXP(struct torture_context *tctx, struct dcerpc_pipe *p)
char *server_name;
char *key_pointer;
+ ntvfs_init(tctx->lp_ctx);
+
ctx = talloc_zero(tctx, struct test_spoolss_win_context);
tmp_ctx = talloc_zero(tctx, struct test_spoolss_win_context);
@@ -570,7 +572,6 @@ struct torture_suite *torture_rpc_spoolss_win(TALLOC_CTX *mem_ctx)
struct torture_rpc_tcase *tcase = torture_suite_add_rpc_iface_tcase(suite,
"win", &ndr_table_spoolss);
- ntvfs_init(global_loadparm);
torture_rpc_tcase_add_test(tcase, "testWinXP", test_WinXP);
return suite;