diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-01-02 18:39:01 -0600 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2008-01-02 12:48:03 -0600 |
commit | 771b347f9b185895390445be96081c781e28a26d (patch) | |
tree | 8cbd2b1276c18583af2ade0bc67cc181a11490ad /source4/torture/basic | |
parent | 37b822e49f3f7a29950ff6f52cfebf72dd583db9 (diff) | |
download | samba-771b347f9b185895390445be96081c781e28a26d.tar.gz samba-771b347f9b185895390445be96081c781e28a26d.tar.bz2 samba-771b347f9b185895390445be96081c781e28a26d.zip |
r26644: Janitorial: Pass resolve_context explicitly to various SMB functions, should help fix the build for OpenChange.
(This used to be commit 385ffe4f4cc9a21a760c0f00410f56e2592fd507)
Diffstat (limited to 'source4/torture/basic')
-rw-r--r-- | source4/torture/basic/base.c | 2 | ||||
-rw-r--r-- | source4/torture/basic/misc.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/source4/torture/basic/base.c b/source4/torture/basic/base.c index cba57ac413..9820a02f27 100644 --- a/source4/torture/basic/base.c +++ b/source4/torture/basic/base.c @@ -51,7 +51,7 @@ static struct smbcli_state *open_nbt_connection(struct torture_context *tctx) goto failed; } - if (!smbcli_socket_connect(cli, host, lp_smb_ports(tctx->lp_ctx), lp_resolve_context(tctx->lp_ctx), lp_max_xmit(tctx->lp_ctx), lp_maxmux(tctx->lp_ctx))) { + if (!smbcli_socket_connect(cli, host, lp_smb_ports(tctx->lp_ctx), lp_resolve_context(tctx->lp_ctx), lp_max_xmit(tctx->lp_ctx), lp_maxmux(tctx->lp_ctx), lp_nt_status_support(tctx->lp_ctx) && lp_use_spnego(tctx->lp_ctx))) { torture_comment(tctx, "Failed to connect with %s\n", host); goto failed; } diff --git a/source4/torture/basic/misc.c b/source4/torture/basic/misc.c index 0832556b53..ccff18bfc4 100644 --- a/source4/torture/basic/misc.c +++ b/source4/torture/basic/misc.c @@ -822,7 +822,8 @@ static struct composite_context *torture_connect_async( smb->in.fallback_to_anonymous=false; smb->in.workgroup=workgroup; - return smb_composite_connect_send(smb,mem_ctx,ev); + return smb_composite_connect_send(smb,mem_ctx, + lp_resolve_context(tctx->lp_ctx),ev); } bool run_benchrw(struct torture_context *tctx) |