diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-12-03 21:25:14 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:47:43 +0100 |
| commit | 1f69adddc54d3b4b91df0ce639b3faccb85b2eb7 (patch) | |
| tree | 58b1b0a6edef4ef5ec574e8fbf5575c033a2a334 | |
| parent | 2f8dc4f48f1802baa3405e7803563f6840e0d1b3 (diff) | |
| download | samba-1f69adddc54d3b4b91df0ce639b3faccb85b2eb7.tar.gz samba-1f69adddc54d3b4b91df0ce639b3faccb85b2eb7.tar.bz2 samba-1f69adddc54d3b4b91df0ce639b3faccb85b2eb7.zip | |
r26267: Fix two calls of smb2_connect I missed.
(This used to be commit fc824a5c457e341995c14bd1cf34894ffc4c62c2)
| -rw-r--r-- | source4/torture/smb2/scan.c | 9 | ||||
| -rw-r--r-- | source4/torture/smb2/util.c | 4 |
2 files changed, 10 insertions, 3 deletions
diff --git a/source4/torture/smb2/scan.c b/source4/torture/smb2/scan.c index eda753b1ee..1ec67492bf 100644 --- a/source4/torture/smb2/scan.c +++ b/source4/torture/smb2/scan.c @@ -25,6 +25,7 @@ #include "lib/cmdline/popt_common.h" #include "lib/events/events.h" #include "torture/torture.h" +#include "param/param.h" #include "torture/smb2/proto.h" @@ -199,7 +200,9 @@ bool torture_smb2_scan(struct torture_context *torture) int opcode; struct smb2_request *req; - status = smb2_connect(mem_ctx, host, share, credentials, &tree, + status = smb2_connect(mem_ctx, host, share, + lp_name_resolve_order(torture->lp_ctx), + credentials, &tree, event_context_find(mem_ctx)); if (!NT_STATUS_IS_OK(status)) { printf("Connection failed - %s\n", nt_errstr(status)); @@ -214,7 +217,9 @@ bool torture_smb2_scan(struct torture_context *torture) smb2_transport_send(req); if (!smb2_request_receive(req)) { talloc_free(tree); - status = smb2_connect(mem_ctx, host, share, credentials, &tree, + status = smb2_connect(mem_ctx, host, share, + lp_name_resolve_order(torture->lp_ctx), + credentials, &tree, event_context_find(mem_ctx)); if (!NT_STATUS_IS_OK(status)) { printf("Connection failed - %s\n", nt_errstr(status)); diff --git a/source4/torture/smb2/util.c b/source4/torture/smb2/util.c index ab3d299c5a..3170b0073d 100644 --- a/source4/torture/smb2/util.c +++ b/source4/torture/smb2/util.c @@ -309,7 +309,9 @@ bool torture_smb2_connection(struct torture_context *tctx, struct smb2_tree **tr const char *share = torture_setting_string(tctx, "share", NULL); struct cli_credentials *credentials = cmdline_credentials; - status = smb2_connect(tctx, host, share, credentials, tree, + status = smb2_connect(tctx, host, share, + lp_name_resolve_order(tctx->lp_ctx), + credentials, tree, event_context_find(tctx)); if (!NT_STATUS_IS_OK(status)) { printf("Failed to connect to SMB2 share \\\\%s\\%s - %s\n", |