summaryrefslogtreecommitdiff
path: root/source4/torture/nbt
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2007-12-10 18:41:45 +0100
committerStefan Metzmacher <metze@samba.org>2007-12-21 05:49:16 +0100
commit274d07ddff5c5920b9a2f3674e9104d8aab9e90c (patch)
treeb71d88bb17279fa5abb1dd035babfa05510c92ad /source4/torture/nbt
parent237059838ccba8daae761f073f354eda536cbc84 (diff)
downloadsamba-274d07ddff5c5920b9a2f3674e9104d8aab9e90c.tar.gz
samba-274d07ddff5c5920b9a2f3674e9104d8aab9e90c.tar.bz2
samba-274d07ddff5c5920b9a2f3674e9104d8aab9e90c.zip
r26381: Move global_loadparm higher up the call stack.
(This used to be commit 992296767492ecd7d21b06f4a08a5b8d73d00740)
Diffstat (limited to 'source4/torture/nbt')
-rw-r--r--source4/torture/nbt/register.c1
-rw-r--r--source4/torture/nbt/winsbench.c1
-rw-r--r--source4/torture/nbt/winsreplication.c2
3 files changed, 4 insertions, 0 deletions
diff --git a/source4/torture/nbt/register.c b/source4/torture/nbt/register.c
index c7f992cbd6..2c37d9de50 100644
--- a/source4/torture/nbt/register.c
+++ b/source4/torture/nbt/register.c
@@ -67,6 +67,7 @@ static bool nbt_register_own(struct torture_context *tctx)
io.in.name = name;
io.in.dest_addr = address;
+ io.in.dest_port = lp_nbt_port(tctx->lp_ctx);
io.in.address = myaddress;
io.in.nb_flags = NBT_NODE_B | NBT_NM_ACTIVE;
io.in.register_demand = false;
diff --git a/source4/torture/nbt/winsbench.c b/source4/torture/nbt/winsbench.c
index 82223d9dd7..d49b50b9d3 100644
--- a/source4/torture/nbt/winsbench.c
+++ b/source4/torture/nbt/winsbench.c
@@ -87,6 +87,7 @@ static void generate_register(struct nbt_name_socket *nbtsock, struct wins_state
io.in.name = generate_name(tmp_ctx, idx);
io.in.dest_addr = state->wins_server;
+ io.in.dest_port = lp_nbt_port(global_loadparm);
io.in.address = state->my_ip;
io.in.nb_flags = NBT_NODE_H;
io.in.register_demand = false;
diff --git a/source4/torture/nbt/winsreplication.c b/source4/torture/nbt/winsreplication.c
index b427843b80..f67b6050f2 100644
--- a/source4/torture/nbt/winsreplication.c
+++ b/source4/torture/nbt/winsreplication.c
@@ -6530,6 +6530,7 @@ static bool test_conflict_owned_released_vs_replica(struct torture_context *tctx
*/
name_register->in.name = records[i].name;
name_register->in.dest_addr = ctx->address;
+ name_register->in.dest_port = lp_nbt_port(tctx->lp_ctx);
name_register->in.address = records[i].wins.ips[0].ip;
name_register->in.nb_flags = records[i].wins.nb_flags;
name_register->in.register_demand= false;
@@ -9218,6 +9219,7 @@ static bool test_conflict_owned_active_vs_replica(struct torture_context *tctx,
name_register->in.name = records[i].name;
name_register->in.dest_addr = ctx->address;
+ name_register->in.dest_port = lp_nbt_port(tctx->lp_ctx);
name_register->in.address = records[i].wins.ips[j].ip;
name_register->in.nb_flags = records[i].wins.nb_flags;
name_register->in.register_demand= false;