diff options
| author | bubulle <bubulle@alioth.debian.org> | 2011-06-07 20:43:08 +0000 |
|---|---|---|
| committer | bubulle <bubulle@alioth.debian.org> | 2011-06-07 20:43:08 +0000 |
| commit | e64520a9ed05c9782a6e8ca8015fdef01b92ecc3 (patch) | |
| tree | fc3a71a0b741cbcc6a5a892f91cc0f2218dfe656 /source4/torture/nbt/winsbench.c | |
| parent | 6fe9013ae23927a67fa6b6033e2711cef99b3533 (diff) | |
| download | samba-e64520a9ed05c9782a6e8ca8015fdef01b92ecc3.tar.gz | |
Revert upstream branch to 3.5.8....oops
git-svn-id: svn://svn.debian.org/svn/pkg-samba/branches/samba/upstream@3810 fc4039ab-9d04-0410-8cac-899223bdd6b0
Diffstat (limited to 'source4/torture/nbt/winsbench.c')
| -rw-r--r-- | source4/torture/nbt/winsbench.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source4/torture/nbt/winsbench.c b/source4/torture/nbt/winsbench.c index aff620878c..bea3d4f9cf 100644 --- a/source4/torture/nbt/winsbench.c +++ b/source4/torture/nbt/winsbench.c @@ -225,7 +225,7 @@ static void generate_request(struct nbt_name_socket *nbtsock, struct wins_state */ static bool bench_wins(struct torture_context *tctx) { - struct nbt_name_socket *nbtsock = nbt_name_socket_init(tctx, tctx->ev); + struct nbt_name_socket *nbtsock = nbt_name_socket_init(tctx, tctx->ev, lp_iconv_convenience(tctx->lp_ctx)); int num_sent=0; struct timeval tv = timeval_current(); bool ret = true; @@ -245,8 +245,8 @@ static bool bench_wins(struct torture_context *tctx) state->num_names = torture_entries; state->registered = talloc_zero_array(state, bool, state->num_names); state->wins_server = address; - state->wins_port = lpcfg_nbt_port(tctx->lp_ctx); - load_interfaces(tctx, lpcfg_interfaces(tctx->lp_ctx), &ifaces); + state->wins_port = lp_nbt_port(tctx->lp_ctx); + load_interfaces(tctx, lp_interfaces(tctx->lp_ctx), &ifaces); state->my_ip = talloc_strdup(tctx, iface_best_ip(ifaces, address)); state->ttl = timelimit; @@ -292,7 +292,8 @@ static bool bench_wins(struct torture_context *tctx) */ struct torture_suite *torture_bench_wins(TALLOC_CTX *mem_ctx) { - struct torture_suite *suite = torture_suite_create(mem_ctx, "bench-wins"); + struct torture_suite *suite = torture_suite_create(mem_ctx, + "BENCH-WINS"); torture_suite_add_simple_test(suite, "wins", bench_wins); |