svn commit: samba r26267 - in branches/SAMBA_4_0: . source/torture/smb2

[jelmer at samba.org]

Author: jelmer
Date: 2007-12-03 21:25:14 +0000 (Mon, 03 Dec 2007)
New Revision: 26267

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26267

Log:
Fix two calls of smb2_connect I missed.
Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/torture/smb2/scan.c
   branches/SAMBA_4_0/source/torture/smb2/util.c


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: bzr:revision-info
...skipped...
Name: bzr:revision-id:v3-trunk0
...skipped...

Modified: branches/SAMBA_4_0/source/torture/smb2/scan.c
===================================================================
--- branches/SAMBA_4_0/source/torture/smb2/scan.c	2007-12-03 21:25:06 UTC (rev 26266)
+++ branches/SAMBA_4_0/source/torture/smb2/scan.c	2007-12-03 21:25:14 UTC (rev 26267)
@@ -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 @@
 	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 @@
 		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));

Modified: branches/SAMBA_4_0/source/torture/smb2/util.c
===================================================================
--- branches/SAMBA_4_0/source/torture/smb2/util.c	2007-12-03 21:25:06 UTC (rev 26266)
+++ branches/SAMBA_4_0/source/torture/smb2/util.c	2007-12-03 21:25:14 UTC (rev 26267)
@@ -309,7 +309,9 @@
 	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",