r26267: Fix two calls of smb2_connect I missed.
authorJelmer Vernooij <jelmer@samba.org>
Mon, 3 Dec 2007 20:25:14 +0000 (21:25 +0100)
committerStefan Metzmacher <metze@samba.org>
Fri, 21 Dec 2007 04:47:43 +0000 (05:47 +0100)
(This used to be commit fc824a5c457e341995c14bd1cf34894ffc4c62c2)

source4/torture/smb2/scan.c
source4/torture/smb2/util.c

index eda753b1ee857fa5df52fdd7ccca5c3271b7b498..1ec67492bf03c1b8fa969fcd1bf4c56f6c3ffb36 100644 (file)
@@ -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));
index ab3d299c5abd1c4d9381c236a64d40feceb598b3..3170b0073dd35e0679a7e14d9face3028e08b766 100644 (file)
@@ -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",