[SCM] Samba Shared Repository - branch master updated

[Volker Lendecke]

The branch, master has been updated
       via  f0b85c1 s4/torture: make --unclist active with smb2 testcases
      from  5b7bc0a ctdb-tests: Add sock daemon test for do_fork

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit f0b85c1da2617f1b4d6f17a2cdab60943aca35e6
Author: Peter Somogyi <psomogyi at hu.ibm.com>
Date:   Tue Aug 29 11:15:11 2017 +0200

    s4/torture: make --unclist active with smb2 testcases
    
    BUG: https://bugzilla.samba.org/show_bug.cgi?id=12985
    
    Signed-off-by: Peter Somogyi <psomogyi at hu.ibm.com>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Volker Lendecke <vl at samba.org>
    
    Autobuild-User(master): Volker Lendecke <vl at samba.org>
    Autobuild-Date(master): Wed Aug 30 00:16:51 CEST 2017 on sn-devel-144

-----------------------------------------------------------------------

Summary of changes:
 lib/torture/torture.h       |  2 ++
 source4/torture/smb2/util.c | 27 +++++++++++++++++++++++++++
 2 files changed, 29 insertions(+)


Changeset truncated at 500 lines:

diff --git a/lib/torture/torture.h b/lib/torture/torture.h
index 6b373a9..c0fbdb9 100644
--- a/lib/torture/torture.h
+++ b/lib/torture/torture.h
@@ -101,6 +101,8 @@ struct torture_context
 
 	/** Loadparm context (will go away in favor of torture_setting_ at some point) */
 	struct loadparm_context *lp_ctx;
+
+	int conn_index;
 };
 
 struct torture_results
diff --git a/source4/torture/smb2/util.c b/source4/torture/smb2/util.c
index 52a63dd..65090b0 100644
--- a/source4/torture/smb2/util.c
+++ b/source4/torture/smb2/util.c
@@ -33,6 +33,7 @@
 
 #include "torture/torture.h"
 #include "torture/smb2/proto.h"
+#include "source4/torture/util.h"
 
 
 /*
@@ -385,6 +386,29 @@ bool torture_smb2_connection_ext(struct torture_context *tctx,
 	NTSTATUS status;
 	const char *host = torture_setting_string(tctx, "host", NULL);
 	const char *share = torture_setting_string(tctx, "share", NULL);
+	const char *p = torture_setting_string(tctx, "unclist", NULL);
+	TALLOC_CTX *mem_ctx = NULL;
+	bool ok;
+
+	if (p != NULL) {
+		char *host2 = NULL;
+		char *share2 = NULL;
+
+		mem_ctx = talloc_new(tctx);
+		if (mem_ctx == NULL) {
+			return false;
+		}
+
+		ok = torture_get_conn_index(tctx->conn_index++, mem_ctx, tctx,
+					    &host2, &share2);
+		if (!ok) {
+			TALLOC_FREE(mem_ctx);
+			return false;
+		}
+
+		host = host2;
+		share = share2;
+	}
 
 	status = smb2_connect_ext(tctx,
 				  host,
@@ -402,8 +426,11 @@ bool torture_smb2_connection_ext(struct torture_context *tctx,
 	if (!NT_STATUS_IS_OK(status)) {
 		torture_comment(tctx, "Failed to connect to SMB2 share \\\\%s\\%s - %s\n",
 		       host, share, nt_errstr(status));
+		TALLOC_FREE(mem_ctx);
 		return false;
 	}
+
+	TALLOC_FREE(mem_ctx);
 	return true;
 }
 


-- 
Samba Shared Repository