diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-12 02:15:20 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:49:39 +0100 |
| commit | 33582dffcc2d348dc042edfdcccee7500b21d928 (patch) | |
| tree | 81a2322009015ae2eb85143fca99e79910502361 /source4/torture/nbt | |
| parent | 46b54defe9ae60646ba0a85dc67a1dcf65b0ed83 (diff) | |
| download | samba-33582dffcc2d348dc042edfdcccee7500b21d928.tar.gz samba-33582dffcc2d348dc042edfdcccee7500b21d928.tar.bz2 samba-33582dffcc2d348dc042edfdcccee7500b21d928.zip | |
r26408: Remove use of global_loadparm.
(This used to be commit f933b4362124bfdd25544b4e27992d9ca4405848)
Diffstat (limited to 'source4/torture/nbt')
| -rw-r--r-- | source4/torture/nbt/wins.c | 2 | ||||
| -rw-r--r-- | source4/torture/nbt/winsbench.c | 3 | ||||
| -rw-r--r-- | source4/torture/nbt/winsreplication.c | 3 |
3 files changed, 7 insertions, 1 deletions
diff --git a/source4/torture/nbt/wins.c b/source4/torture/nbt/wins.c index a236099a13..3107b19075 100644 --- a/source4/torture/nbt/wins.c +++ b/source4/torture/nbt/wins.c @@ -80,6 +80,7 @@ static bool nbt_test_wins_name(struct torture_context *tctx, const char *address torture_comment(tctx, "release the name\n"); release.in.name = *name; + release.in.dest_port = lp_nbt_port(tctx->lp_ctx); release.in.dest_addr = address; release.in.address = myaddress; release.in.nb_flags = nb_flags; @@ -165,6 +166,7 @@ static bool nbt_test_wins_name(struct torture_context *tctx, const char *address torture_comment(tctx, "refresh the name\n"); refresh.in.name = *name; + refresh.in.wins_port = lp_nbt_port(tctx->lp_ctx); refresh.in.wins_servers = str_list_make(tctx, address, NULL); refresh.in.addresses = str_list_make(tctx, myaddress, NULL); refresh.in.nb_flags = nb_flags; diff --git a/source4/torture/nbt/winsbench.c b/source4/torture/nbt/winsbench.c index db9371977e..5d7dbaf93e 100644 --- a/source4/torture/nbt/winsbench.c +++ b/source4/torture/nbt/winsbench.c @@ -87,7 +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.dest_port = state->wins_port; io.in.address = state->my_ip; io.in.nb_flags = NBT_NODE_H; io.in.register_demand = false; @@ -139,6 +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_addr = state->wins_server; io.in.address = state->my_ip; io.in.nb_flags = NBT_NODE_H; diff --git a/source4/torture/nbt/winsreplication.c b/source4/torture/nbt/winsreplication.c index d1c8e9a961..d96ed3e931 100644 --- a/source4/torture/nbt/winsreplication.c +++ b/source4/torture/nbt/winsreplication.c @@ -6562,6 +6562,7 @@ static bool test_conflict_owned_released_vs_replica(struct torture_context *tctx /* release the record */ release->in.name = records[i].name; + release->in.dest_port = lp_nbt_port(tctx->lp_ctx); release->in.dest_addr = ctx->address; release->in.address = records[i].wins.ips[0].ip; release->in.nb_flags = records[i].wins.nb_flags; @@ -6616,6 +6617,7 @@ static bool test_conflict_owned_released_vs_replica(struct torture_context *tctx } else { release->in.name = records[i].name; release->in.dest_addr = ctx->address; + release->in.dest_port = lp_nbt_port(tctx->lp_ctx); release->in.address = records[i].wins.ips[0].ip; release->in.nb_flags = records[i].wins.nb_flags; release->in.broadcast = false; @@ -9368,6 +9370,7 @@ static bool test_conflict_owned_active_vs_replica(struct torture_context *tctx, release->in.name = records[i].name; release->in.dest_addr = ctx->address; + release->in.dest_port = lp_nbt_port(tctx->lp_ctx); release->in.address = records[i].wins.ips[j].ip; release->in.nb_flags = records[i].wins.nb_flags; release->in.broadcast = false; |