From 0fff7ba143022d36064433e4494d83f9ba7d9944 Mon Sep 17 00:00:00 2001
From: James Peach <jpeach@samba.org>
Date: Fri, 2 Mar 2007 05:58:22 +0000
Subject: r21648: Start a UNIX extensions test set. Add a test for the
 SMBWhoami query. (This used to be commit
 ca89683dc28104a8cee23b0c1428350f22a68c99)

---
 source4/torture/unix/whoami.c | 342 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 342 insertions(+)
 create mode 100644 source4/torture/unix/whoami.c

(limited to 'source4/torture/unix/whoami.c')

diff --git a/source4/torture/unix/whoami.c b/source4/torture/unix/whoami.c
new file mode 100644
index 0000000000..7adb344eac
--- /dev/null
+++ b/source4/torture/unix/whoami.c
@@ -0,0 +1,342 @@
+/*
+   Test the SMB_WHOAMI Unix extension.
+
+   Copyright (C) 2007 James Peach
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include "includes.h"
+#include "torture/torture.h"
+#include "torture/basic/proto.h"
+#include "libcli/libcli.h"
+#include "libcli/raw/interfaces.h"
+#include "lib/cmdline/popt_common.h"
+#include "auth/credentials/credentials.h"
+
+#define SMB_QUERY_POSIX_WHOAMI     0x202
+
+/* Size (in bytes) of the required fields in the SMBwhoami response. */
+#define WHOAMI_REQUIRED_SIZE	40
+
+enum smb_whoami_flags {
+    SMB_WHOAMI_GUEST = 0x1 /* Logged in as (or squashed to) guest */
+};
+
+/*
+   SMBWhoami - Query the user mapping performed by the server for the
+   connected tree. This is a subcommand of the TRANS2_QFSINFO.
+
+   Returns:
+       4 bytes unsigned -      mapping flags (smb_whoami_flags)
+       4 bytes unsigned -      flags mask
+
+       8 bytes unsigned -      primary UID
+       8 bytes unsigned -      primary GID
+       4 bytes unsigned -      number of supplementary GIDs
+       4 bytes unsigned -      number of SIDs
+       4 bytes unsigned -      SID list byte count
+       4 bytes -               pad / reserved (must be zero)
+
+       8 bytes unsigned[] -    list of GIDs (may be empty)
+       DOM_SID[] -             list of SIDs (may be empty)
+*/
+
+struct smb_whoami
+{
+	uint32_t	mapping_flags;
+	uint32_t	mapping_mask;
+	uint64_t	server_uid;
+	uint64_t	server_gid;
+	uint32_t	num_gids;
+	uint32_t	num_sids;
+	uint32_t	num_sid_bytes;
+	uint32_t	reserved; /* Must be zero */
+	uint64_t *	gid_list;
+	struct dom_sid ** sid_list;
+};
+
+static struct smbcli_state *connect_to_server(void *mem_ctx)
+{
+	NTSTATUS status;
+	struct smbcli_state *cli;
+
+	const char *host = lp_parm_string(-1, "torture", "host");
+	const char *share = lp_parm_string(-1, "torture", "share");
+
+	status = smbcli_full_connection(mem_ctx, &cli,
+					host, share, NULL,
+					cmdline_credentials, NULL);
+
+	if (!NT_STATUS_IS_OK(status)) {
+		printf("failed to connect to //%s/%s: %s\n",
+			host, share, nt_errstr(status));
+		return NULL;
+	}
+
+	return cli;
+}
+
+static BOOL sid_parse(void *mem_ctx,
+		struct torture_context *torture,
+		DATA_BLOB *data, size_t *offset,
+		struct dom_sid **psid)
+{
+	size_t remain = data->length - *offset;
+	int i;
+
+	*psid = talloc_zero(mem_ctx, struct dom_sid);
+	torture_assert(torture, *psid != NULL, "out of memory");
+
+	torture_assert(torture, remain >= 8,
+			"invalid SID format");
+
+        (*psid)->sid_rev_num = CVAL(data->data, *offset);
+        (*psid)->num_auths = CVAL(data->data, *offset + 1);
+        memcpy((*psid)->id_auth, data->data + *offset + 2, 6);
+
+	(*offset) += 8;
+	remain = data->length - *offset;
+
+	torture_assert(torture, remain >= ((*psid)->num_auths * 4),
+			"invalid sub_auth byte count");
+	torture_assert(torture, (*psid)->num_auths >= 0,
+			"invalid sub_auth value");
+	torture_assert(torture, (*psid)->num_auths <= 15,
+			"invalid sub_auth value");
+
+	(*psid)->sub_auths = talloc_array(mem_ctx, uint32_t,
+			(*psid)->num_auths);
+	torture_assert(torture, (*psid)->sub_auths != NULL,
+			"out of memory");
+
+        for (i = 0; i < (*psid)->num_auths; i++) {
+                (*psid)->sub_auths[i] = IVAL(data->data, *offset);
+		(*offset) += 4;
+	}
+
+	return True;
+}
+
+static BOOL smb_raw_query_posix_whoami(void *mem_ctx,
+				struct torture_context *torture,
+				struct smbcli_state *cli,
+				struct smb_whoami *whoami,
+				unsigned max_data)
+{
+	struct smb_trans2 tp;
+	NTSTATUS status;
+	size_t offset;
+	int i;
+
+	uint16_t setup = TRANSACT2_QFSINFO;
+	uint16_t info_level;
+
+	ZERO_STRUCTP(whoami);
+
+	tp.in.max_setup = 0;
+	tp.in.flags = 0;
+	tp.in.timeout = 0;
+	tp.in.setup_count = 1;
+	tp.in.max_param = 10;
+	tp.in.max_data = (uint16_t)max_data;
+	tp.in.setup = &setup;
+	tp.in.trans_name = NULL;
+	SSVAL(&info_level, 0, SMB_QUERY_POSIX_WHOAMI);
+	tp.in.params = data_blob_talloc(mem_ctx, &info_level, 2);
+	tp.in.data = data_blob_talloc(mem_ctx, NULL, 0);
+
+	status = smb_raw_trans2(cli->tree, mem_ctx, &tp);
+	torture_assert_ntstatus_equal(torture, status, NT_STATUS_OK,
+			"doing SMB_QUERY_POSIX_WHOAMI");
+
+	/* Make sure we got back all the required fields. */
+	torture_assert(torture, tp.out.params.length == 0,
+			"trans2 params should be empty");
+	torture_assert(torture, tp.out.data.length >= WHOAMI_REQUIRED_SIZE,
+			"checking for required response fields");
+
+	whoami->mapping_flags = IVAL(tp.out.data.data, 0);
+	whoami->mapping_mask = IVAL(tp.out.data.data, 4);
+	whoami->server_uid = BVAL(tp.out.data.data, 8);
+	whoami->server_gid = BVAL(tp.out.data.data, 16);
+	whoami->num_gids = IVAL(tp.out.data.data, 24);
+	whoami->num_sids = IVAL(tp.out.data.data, 28);
+	whoami->num_sid_bytes = IVAL(tp.out.data.data, 32);
+	whoami->reserved = IVAL(tp.out.data.data, 36);
+
+	/* The GID list and SID list are optional, depending on the count
+	 * and length fields.
+	 */
+	if (whoami->num_sids != 0) {
+		torture_assert(torture, whoami->num_sid_bytes != 0,
+				"SID count does not match byte count");
+	}
+
+	printf("\tmapping_flags=0x%08x mapping_mask=0x%08x\n",
+			whoami->mapping_flags, whoami->mapping_mask);
+	printf("\tserver UID=%lld GID=%lld\n",
+			whoami->server_uid, whoami->server_gid);
+	printf("\t%u GIDs, %u SIDs, %u SID bytes\n",
+			whoami->num_gids, whoami->num_sids,
+			whoami->num_sid_bytes);
+
+	offset = WHOAMI_REQUIRED_SIZE;
+
+	torture_assert_int_equal(torture, whoami->reserved, 0,
+			"invalid reserved field");
+
+	if (tp.out.data.length == offset) {
+		/* No SIDs or GIDs returned */
+		torture_assert_int_equal(torture, whoami->num_gids, 0,
+				"invalid GID count");
+		torture_assert_int_equal(torture, whoami->num_sids, 0,
+				"invalid SID count");
+		torture_assert_int_equal(torture, whoami->num_sid_bytes, 0,
+				"invalid SID byte count");
+		return True;
+	}
+
+	if (whoami->num_gids != 0) {
+		int remain = tp.out.data.length - offset;
+		int gid_bytes = whoami->num_gids * 8;
+
+		if (whoami->num_sids == 0) {
+			torture_assert_int_equal(torture, remain, gid_bytes,
+					"GID count does not match data length");
+		} else {
+			torture_assert(torture, remain > gid_bytes,
+						"invalid GID count");
+		}
+
+		whoami->gid_list = talloc_array(mem_ctx, uint64_t, whoami->num_gids);
+		torture_assert(torture, whoami->gid_list != NULL, "out of memory");
+
+		for (i = 0; i < whoami->num_gids; ++i) {
+			whoami->gid_list[i] = BVAL(tp.out.data.data, offset);
+			offset += 8;
+		}
+	}
+
+	/* Check if there should be data left for the SID list. */
+	if (tp.out.data.length == offset) {
+		torture_assert_int_equal(torture, whoami->num_sids, 0,
+				"invalid SID count");
+		return True;
+	}
+
+	/* All the remaining bytes must be the SID list. */
+	torture_assert_int_equal(torture,
+		whoami->num_sid_bytes, (tp.out.data.length - offset),
+		"invalid SID byte count");
+
+	if (whoami->num_sids != 0) {
+
+		whoami->sid_list = talloc_array(mem_ctx, struct dom_sid *,
+				whoami->num_sids);
+		torture_assert(torture, whoami->sid_list != NULL,
+				"out of memory");
+
+		for (i = 0; i < whoami->num_sids; ++i) {
+			if (!sid_parse(mem_ctx, torture,
+					&tp.out.data, &offset,
+					&whoami->sid_list[i])) {
+				return False;
+			}
+
+		}
+	}
+
+	/* We should be at the end of the response now. */
+	torture_assert_int_equal(torture, tp.out.data.length, offset,
+			"trailing garbage bytes");
+
+	return True;
+}
+
+BOOL apple_torture_unix_whoami(struct torture_context *torture)
+{
+	struct smbcli_state *cli;
+	struct smb_whoami whoami;
+	void *mem_ctx;
+
+	mem_ctx = talloc_init("smb_query_posix_whoami");
+	torture_assert(torture, mem_ctx != NULL, "malloc failed");
+
+	if (!(cli = connect_to_server(mem_ctx))) {
+		goto fail;
+	}
+
+	/* Test basic authenticated mapping. */
+	printf("calling SMB_QUERY_POSIX_WHOAMI on an authenticated connection\n");
+	if (!smb_raw_query_posix_whoami(mem_ctx, torture,
+				cli, &whoami, 0xFFFF)) {
+		smbcli_tdis(cli);
+		goto fail;
+	}
+
+	/* Test that the server drops the UID and GID list. */
+	printf("calling SMB_QUERY_POSIX_WHOAMI with a small buffer\n");
+	if (!smb_raw_query_posix_whoami(mem_ctx, torture,
+				cli, &whoami, 0x40)) {
+		smbcli_tdis(cli);
+		goto fail;
+	}
+
+	torture_assert_int_equal(torture, whoami.num_gids, 0,
+			"invalid GID count");
+	torture_assert_int_equal(torture, whoami.num_sids, 0,
+			"invalid SID count");
+	torture_assert_int_equal(torture, whoami.num_sid_bytes, 0,
+			"invalid SID bytes count");
+
+	smbcli_tdis(cli);
+	cli_credentials_set_anonymous(cmdline_credentials);
+
+	if (!(cli = connect_to_server(mem_ctx))) {
+		goto fail;
+	}
+
+	printf("calling SMB_QUERY_POSIX_WHOAMI on an anonymous connection\n");
+	if (!smb_raw_query_posix_whoami(mem_ctx, torture,
+				cli, &whoami, 0xFFFF)) {
+		smbcli_tdis(cli);
+		goto fail;
+	}
+
+	smbcli_tdis(cli);
+
+	/* Check that our anonymous login mapped us to guest on the server, but
+	 * only if the server supports this.
+	 */
+	if (whoami.mapping_mask & SMB_WHOAMI_GUEST) {
+		printf("checking whether we were logged in as guest... %s\n",
+			whoami.mapping_flags & SMB_WHOAMI_GUEST ? "YES" : "NO");
+		torture_assert(torture, whoami.mapping_flags & SMB_WHOAMI_GUEST,
+				"anonymous login did not map to guest");
+	} else {
+		printf("server does not support SMB_WHOAMI_GUEST flag\n");
+	}
+
+	talloc_free(mem_ctx);
+	return True;
+
+fail:
+	talloc_free(mem_ctx);
+	return False;
+
+}
+
+/* vim: set sts=8 sw=8 : */
-- 
cgit 


From 737454d6a07ad08cc244e9d98cafc95a7565e87b Mon Sep 17 00:00:00 2001
From: James Peach <jpeach@samba.org>
Date: Fri, 2 Mar 2007 17:47:58 +0000
Subject: r21659: Rename functions. (This used to be commit
 6e645577a60bc79431a962b6522e8592b7c50e98)

---
 source4/torture/unix/whoami.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/torture/unix/whoami.c')

diff --git a/source4/torture/unix/whoami.c b/source4/torture/unix/whoami.c
index 7adb344eac..25f9b11bee 100644
--- a/source4/torture/unix/whoami.c
+++ b/source4/torture/unix/whoami.c
@@ -266,7 +266,7 @@ static BOOL smb_raw_query_posix_whoami(void *mem_ctx,
 	return True;
 }
 
-BOOL apple_torture_unix_whoami(struct torture_context *torture)
+BOOL torture_unix_whoami(struct torture_context *torture)
 {
 	struct smbcli_state *cli;
 	struct smb_whoami whoami;
-- 
cgit 


From fcaeedeff3c7d65f65da19440eb7b1ac01481167 Mon Sep 17 00:00:00 2001
From: James Peach <jpeach@samba.org>
Date: Fri, 2 Mar 2007 23:24:27 +0000
Subject: r21668: Add SMB_QFS_POSIX_WHOAMI to trans2.h so it's easy to find.
 Add convenience API to create an anonymous credential. Don't clobber
 cmdline_credentials in the UNIX-WHOAMI test. (This used to be commit
 73cea4e0c66f57057ed12b07bbb94b4e783ba6bf)

---
 source4/torture/unix/whoami.c | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

(limited to 'source4/torture/unix/whoami.c')

diff --git a/source4/torture/unix/whoami.c b/source4/torture/unix/whoami.c
index 25f9b11bee..4e846ffdcc 100644
--- a/source4/torture/unix/whoami.c
+++ b/source4/torture/unix/whoami.c
@@ -26,8 +26,6 @@
 #include "lib/cmdline/popt_common.h"
 #include "auth/credentials/credentials.h"
 
-#define SMB_QUERY_POSIX_WHOAMI     0x202
-
 /* Size (in bytes) of the required fields in the SMBwhoami response. */
 #define WHOAMI_REQUIRED_SIZE	40
 
@@ -68,7 +66,8 @@ struct smb_whoami
 	struct dom_sid ** sid_list;
 };
 
-static struct smbcli_state *connect_to_server(void *mem_ctx)
+static struct smbcli_state *connect_to_server(void *mem_ctx,
+		struct cli_credentials *creds)
 {
 	NTSTATUS status;
 	struct smbcli_state *cli;
@@ -78,7 +77,7 @@ static struct smbcli_state *connect_to_server(void *mem_ctx)
 
 	status = smbcli_full_connection(mem_ctx, &cli,
 					host, share, NULL,
-					cmdline_credentials, NULL);
+					creds, NULL);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		printf("failed to connect to //%s/%s: %s\n",
@@ -154,13 +153,13 @@ static BOOL smb_raw_query_posix_whoami(void *mem_ctx,
 	tp.in.max_data = (uint16_t)max_data;
 	tp.in.setup = &setup;
 	tp.in.trans_name = NULL;
-	SSVAL(&info_level, 0, SMB_QUERY_POSIX_WHOAMI);
+	SSVAL(&info_level, 0, SMB_QFS_POSIX_WHOAMI);
 	tp.in.params = data_blob_talloc(mem_ctx, &info_level, 2);
 	tp.in.data = data_blob_talloc(mem_ctx, NULL, 0);
 
 	status = smb_raw_trans2(cli->tree, mem_ctx, &tp);
 	torture_assert_ntstatus_equal(torture, status, NT_STATUS_OK,
-			"doing SMB_QUERY_POSIX_WHOAMI");
+			"doing SMB_QFS_POSIX_WHOAMI");
 
 	/* Make sure we got back all the required fields. */
 	torture_assert(torture, tp.out.params.length == 0,
@@ -269,18 +268,19 @@ static BOOL smb_raw_query_posix_whoami(void *mem_ctx,
 BOOL torture_unix_whoami(struct torture_context *torture)
 {
 	struct smbcli_state *cli;
+	struct cli_credentials *anon_credentials;
 	struct smb_whoami whoami;
 	void *mem_ctx;
 
 	mem_ctx = talloc_init("smb_query_posix_whoami");
 	torture_assert(torture, mem_ctx != NULL, "malloc failed");
 
-	if (!(cli = connect_to_server(mem_ctx))) {
+	if (!(cli = connect_to_server(mem_ctx, cmdline_credentials))) {
 		goto fail;
 	}
 
 	/* Test basic authenticated mapping. */
-	printf("calling SMB_QUERY_POSIX_WHOAMI on an authenticated connection\n");
+	printf("calling SMB_QFS_POSIX_WHOAMI on an authenticated connection\n");
 	if (!smb_raw_query_posix_whoami(mem_ctx, torture,
 				cli, &whoami, 0xFFFF)) {
 		smbcli_tdis(cli);
@@ -288,7 +288,7 @@ BOOL torture_unix_whoami(struct torture_context *torture)
 	}
 
 	/* Test that the server drops the UID and GID list. */
-	printf("calling SMB_QUERY_POSIX_WHOAMI with a small buffer\n");
+	printf("calling SMB_QFS_POSIX_WHOAMI with a small buffer\n");
 	if (!smb_raw_query_posix_whoami(mem_ctx, torture,
 				cli, &whoami, 0x40)) {
 		smbcli_tdis(cli);
@@ -303,13 +303,14 @@ BOOL torture_unix_whoami(struct torture_context *torture)
 			"invalid SID bytes count");
 
 	smbcli_tdis(cli);
-	cli_credentials_set_anonymous(cmdline_credentials);
 
-	if (!(cli = connect_to_server(mem_ctx))) {
+	printf("calling SMB_QFS_POSIX_WHOAMI on an anonymous connection\n");
+	anon_credentials = cli_credentials_init_anon(mem_ctx);
+
+	if (!(cli = connect_to_server(mem_ctx, anon_credentials))) {
 		goto fail;
 	}
 
-	printf("calling SMB_QUERY_POSIX_WHOAMI on an anonymous connection\n");
 	if (!smb_raw_query_posix_whoami(mem_ctx, torture,
 				cli, &whoami, 0xFFFF)) {
 		smbcli_tdis(cli);
-- 
cgit 


From 0479a2f1cbae51fcd8dbdc3c148c808421fb4d25 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 10 Jul 2007 02:07:03 +0000
Subject: r23792: convert Samba4 to GPLv3

There are still a few tidyups of old FSF addresses to come (in both s3
and s4). More commits soon.
(This used to be commit fcf38a38ac691abd0fa51b89dc951a08e89fdafa)
---
 source4/torture/unix/whoami.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'source4/torture/unix/whoami.c')

diff --git a/source4/torture/unix/whoami.c b/source4/torture/unix/whoami.c
index 4e846ffdcc..28e220d363 100644
--- a/source4/torture/unix/whoami.c
+++ b/source4/torture/unix/whoami.c
@@ -5,7 +5,7 @@
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2 of the License, or
+   the Free Software Foundation; either version 3 of the License, or
    (at your option) any later version.
 
    This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
    GNU General Public License for more details.
 
    You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "includes.h"
-- 
cgit 


From dfa4e5f78440e375a9c47eab913c5980c1aa640b Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Thu, 23 Aug 2007 02:10:17 +0000
Subject: r24631: Fix up format warnings, found on my Fedora 7 x86_64
 workstation.

Andrew Bartlett
(This used to be commit 3d74d178bfd89127ff387939e848b240e638cc35)
---
 source4/torture/unix/whoami.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/torture/unix/whoami.c')

diff --git a/source4/torture/unix/whoami.c b/source4/torture/unix/whoami.c
index 28e220d363..8322e57bd1 100644
--- a/source4/torture/unix/whoami.c
+++ b/source4/torture/unix/whoami.c
@@ -185,8 +185,8 @@ static BOOL smb_raw_query_posix_whoami(void *mem_ctx,
 
 	printf("\tmapping_flags=0x%08x mapping_mask=0x%08x\n",
 			whoami->mapping_flags, whoami->mapping_mask);
-	printf("\tserver UID=%lld GID=%lld\n",
-			whoami->server_uid, whoami->server_gid);
+	printf("\tserver UID=%llu GID=%llu\n",
+	       (unsigned long long)whoami->server_uid, (unsigned long long)whoami->server_gid);
 	printf("\t%u GIDs, %u SIDs, %u SID bytes\n",
 			whoami->num_gids, whoami->num_sids,
 			whoami->num_sid_bytes);
-- 
cgit 


From ffeee68e4b72dd94fee57366bd8d38b8c284c3d4 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 8 Sep 2007 12:42:09 +0000
Subject: r25026: Move param/param.h out of includes.h (This used to be commit
 abe8349f9b4387961ff3665d8c589d61cd2edf31)

---
 source4/torture/unix/whoami.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/torture/unix/whoami.c')

diff --git a/source4/torture/unix/whoami.c b/source4/torture/unix/whoami.c
index 8322e57bd1..80431f5ac5 100644
--- a/source4/torture/unix/whoami.c
+++ b/source4/torture/unix/whoami.c
@@ -24,6 +24,7 @@
 #include "libcli/raw/interfaces.h"
 #include "lib/cmdline/popt_common.h"
 #include "auth/credentials/credentials.h"
+#include "param/param.h"
 
 /* Size (in bytes) of the required fields in the SMBwhoami response. */
 #define WHOAMI_REQUIRED_SIZE	40
-- 
cgit 


From 98b57d5eb61094a9c88e2f7d90d3e21b7e74e9d8 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 8 Sep 2007 16:46:30 +0000
Subject: r25035: Fix some more warnings, use service pointer rather than
 service number in more places. (This used to be commit
 df9cebcb97e20564359097148665bd519f31bc6f)

---
 source4/torture/unix/whoami.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/torture/unix/whoami.c')

diff --git a/source4/torture/unix/whoami.c b/source4/torture/unix/whoami.c
index 80431f5ac5..aea1ee19e0 100644
--- a/source4/torture/unix/whoami.c
+++ b/source4/torture/unix/whoami.c
@@ -72,8 +72,8 @@ static struct smbcli_state *connect_to_server(void *mem_ctx,
 	NTSTATUS status;
 	struct smbcli_state *cli;
 
-	const char *host = lp_parm_string(-1, "torture", "host");
-	const char *share = lp_parm_string(-1, "torture", "share");
+	const char *host = lp_parm_string(NULL, "torture", "host");
+	const char *share = lp_parm_string(NULL, "torture", "share");
 
 	status = smbcli_full_connection(mem_ctx, &cli,
 					host, share, NULL,
-- 
cgit 


From 60a1046c5c5783799bd64fe18e03534670f83d82 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 29 Sep 2007 18:00:19 +0000
Subject: r25430: Add the loadparm context to all parametric options. (This
 used to be commit fd697d77c9fe67a00939a1f04b35c451316fff58)

---
 source4/torture/unix/whoami.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/torture/unix/whoami.c')

diff --git a/source4/torture/unix/whoami.c b/source4/torture/unix/whoami.c
index aea1ee19e0..bc2f4382bb 100644
--- a/source4/torture/unix/whoami.c
+++ b/source4/torture/unix/whoami.c
@@ -72,8 +72,8 @@ static struct smbcli_state *connect_to_server(void *mem_ctx,
 	NTSTATUS status;
 	struct smbcli_state *cli;
 
-	const char *host = lp_parm_string(NULL, "torture", "host");
-	const char *share = lp_parm_string(NULL, "torture", "share");
+	const char *host = lp_parm_string(global_loadparm, NULL, "torture", "host");
+	const char *share = lp_parm_string(global_loadparm, NULL, "torture", "share");
 
 	status = smbcli_full_connection(mem_ctx, &cli,
 					host, share, NULL,
-- 
cgit 


From 2151cde58014ea2e822c13d2f8a369b45dc19ca8 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sat, 6 Oct 2007 22:28:14 +0000
Subject: r25554: Convert last instances of BOOL, True and False to the
 standard types. (This used to be commit
 566aa14139510788548a874e9213d91317f83ca9)

---
 source4/torture/unix/whoami.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'source4/torture/unix/whoami.c')

diff --git a/source4/torture/unix/whoami.c b/source4/torture/unix/whoami.c
index bc2f4382bb..f45d2345db 100644
--- a/source4/torture/unix/whoami.c
+++ b/source4/torture/unix/whoami.c
@@ -88,7 +88,7 @@ static struct smbcli_state *connect_to_server(void *mem_ctx,
 	return cli;
 }
 
-static BOOL sid_parse(void *mem_ctx,
+static bool sid_parse(void *mem_ctx,
 		struct torture_context *torture,
 		DATA_BLOB *data, size_t *offset,
 		struct dom_sid **psid)
@@ -126,10 +126,10 @@ static BOOL sid_parse(void *mem_ctx,
 		(*offset) += 4;
 	}
 
-	return True;
+	return true;
 }
 
-static BOOL smb_raw_query_posix_whoami(void *mem_ctx,
+static bool smb_raw_query_posix_whoami(void *mem_ctx,
 				struct torture_context *torture,
 				struct smbcli_state *cli,
 				struct smb_whoami *whoami,
@@ -205,7 +205,7 @@ static BOOL smb_raw_query_posix_whoami(void *mem_ctx,
 				"invalid SID count");
 		torture_assert_int_equal(torture, whoami->num_sid_bytes, 0,
 				"invalid SID byte count");
-		return True;
+		return true;
 	}
 
 	if (whoami->num_gids != 0) {
@@ -233,7 +233,7 @@ static BOOL smb_raw_query_posix_whoami(void *mem_ctx,
 	if (tp.out.data.length == offset) {
 		torture_assert_int_equal(torture, whoami->num_sids, 0,
 				"invalid SID count");
-		return True;
+		return true;
 	}
 
 	/* All the remaining bytes must be the SID list. */
@@ -252,7 +252,7 @@ static BOOL smb_raw_query_posix_whoami(void *mem_ctx,
 			if (!sid_parse(mem_ctx, torture,
 					&tp.out.data, &offset,
 					&whoami->sid_list[i])) {
-				return False;
+				return false;
 			}
 
 		}
@@ -262,10 +262,10 @@ static BOOL smb_raw_query_posix_whoami(void *mem_ctx,
 	torture_assert_int_equal(torture, tp.out.data.length, offset,
 			"trailing garbage bytes");
 
-	return True;
+	return true;
 }
 
-BOOL torture_unix_whoami(struct torture_context *torture)
+bool torture_unix_whoami(struct torture_context *torture)
 {
 	struct smbcli_state *cli;
 	struct cli_credentials *anon_credentials;
@@ -332,11 +332,11 @@ BOOL torture_unix_whoami(struct torture_context *torture)
 	}
 
 	talloc_free(mem_ctx);
-	return True;
+	return true;
 
 fail:
 	talloc_free(mem_ctx);
-	return False;
+	return false;
 
 }
 
-- 
cgit 


From bbdfbf8d9d486aee51117976b8f825759a4c4a37 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 3 Dec 2007 00:28:22 +0100
Subject: r26238: Add a loadparm context parameter to torture_context, remove
 more uses of global_loadparm. (This used to be commit
 a33a5530545086b81a3b205aa109dff11c546926)

---
 source4/torture/unix/whoami.c | 40 +++++++++++++++-------------------------
 1 file changed, 15 insertions(+), 25 deletions(-)

(limited to 'source4/torture/unix/whoami.c')

diff --git a/source4/torture/unix/whoami.c b/source4/torture/unix/whoami.c
index f45d2345db..422e2abcbf 100644
--- a/source4/torture/unix/whoami.c
+++ b/source4/torture/unix/whoami.c
@@ -66,16 +66,16 @@ struct smb_whoami
 	struct dom_sid ** sid_list;
 };
 
-static struct smbcli_state *connect_to_server(void *mem_ctx,
+static struct smbcli_state *connect_to_server(struct torture_context *tctx,
 		struct cli_credentials *creds)
 {
 	NTSTATUS status;
 	struct smbcli_state *cli;
 
-	const char *host = lp_parm_string(global_loadparm, NULL, "torture", "host");
-	const char *share = lp_parm_string(global_loadparm, NULL, "torture", "share");
+	const char *host = torture_setting_string(tctx, "host", NULL);
+	const char *share = torture_setting_string(tctx, "share", NULL);
 
-	status = smbcli_full_connection(mem_ctx, &cli,
+	status = smbcli_full_connection(tctx, &cli,
 					host, share, NULL,
 					creds, NULL);
 
@@ -270,29 +270,25 @@ bool torture_unix_whoami(struct torture_context *torture)
 	struct smbcli_state *cli;
 	struct cli_credentials *anon_credentials;
 	struct smb_whoami whoami;
-	void *mem_ctx;
 
-	mem_ctx = talloc_init("smb_query_posix_whoami");
-	torture_assert(torture, mem_ctx != NULL, "malloc failed");
-
-	if (!(cli = connect_to_server(mem_ctx, cmdline_credentials))) {
-		goto fail;
+	if (!(cli = connect_to_server(torture, cmdline_credentials))) {
+		return false;
 	}
 
 	/* Test basic authenticated mapping. */
 	printf("calling SMB_QFS_POSIX_WHOAMI on an authenticated connection\n");
-	if (!smb_raw_query_posix_whoami(mem_ctx, torture,
+	if (!smb_raw_query_posix_whoami(torture, torture,
 				cli, &whoami, 0xFFFF)) {
 		smbcli_tdis(cli);
-		goto fail;
+		return false;
 	}
 
 	/* Test that the server drops the UID and GID list. */
 	printf("calling SMB_QFS_POSIX_WHOAMI with a small buffer\n");
-	if (!smb_raw_query_posix_whoami(mem_ctx, torture,
+	if (!smb_raw_query_posix_whoami(torture, torture,
 				cli, &whoami, 0x40)) {
 		smbcli_tdis(cli);
-		goto fail;
+		return false;
 	}
 
 	torture_assert_int_equal(torture, whoami.num_gids, 0,
@@ -305,16 +301,16 @@ bool torture_unix_whoami(struct torture_context *torture)
 	smbcli_tdis(cli);
 
 	printf("calling SMB_QFS_POSIX_WHOAMI on an anonymous connection\n");
-	anon_credentials = cli_credentials_init_anon(mem_ctx);
+	anon_credentials = cli_credentials_init_anon(torture);
 
-	if (!(cli = connect_to_server(mem_ctx, anon_credentials))) {
-		goto fail;
+	if (!(cli = connect_to_server(torture, anon_credentials))) {
+		return false;
 	}
 
-	if (!smb_raw_query_posix_whoami(mem_ctx, torture,
+	if (!smb_raw_query_posix_whoami(torture, torture,
 				cli, &whoami, 0xFFFF)) {
 		smbcli_tdis(cli);
-		goto fail;
+		return false;
 	}
 
 	smbcli_tdis(cli);
@@ -331,13 +327,7 @@ bool torture_unix_whoami(struct torture_context *torture)
 		printf("server does not support SMB_WHOAMI_GUEST flag\n");
 	}
 
-	talloc_free(mem_ctx);
 	return true;
-
-fail:
-	talloc_free(mem_ctx);
-	return false;
-
 }
 
 /* vim: set sts=8 sw=8 : */
-- 
cgit 


From 4b0199a5493ea2b88558cc40871e63c1dc8dbb56 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 12 Dec 2007 02:15:29 +0100
Subject: r26409: Pass smb ports along. (This used to be commit
 2833f320de1f1fd39c710ad0a61c3fa1bb1df31f)

---
 source4/torture/unix/whoami.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'source4/torture/unix/whoami.c')

diff --git a/source4/torture/unix/whoami.c b/source4/torture/unix/whoami.c
index 422e2abcbf..412a256da7 100644
--- a/source4/torture/unix/whoami.c
+++ b/source4/torture/unix/whoami.c
@@ -75,8 +75,9 @@ static struct smbcli_state *connect_to_server(struct torture_context *tctx,
 	const char *host = torture_setting_string(tctx, "host", NULL);
 	const char *share = torture_setting_string(tctx, "share", NULL);
 
-	status = smbcli_full_connection(tctx, &cli,
-					host, share, NULL,
+	status = smbcli_full_connection(tctx, &cli, host, 
+					lp_smb_ports(tctx->lp_ctx),
+					share, NULL,
 					creds, NULL);
 
 	if (!NT_STATUS_IS_OK(status)) {
-- 
cgit 


From 771b347f9b185895390445be96081c781e28a26d Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 2 Jan 2008 18:39:01 -0600
Subject: r26644: Janitorial: Pass resolve_context explicitly to various SMB
 functions, should help fix the build for OpenChange. (This used to be commit
 385ffe4f4cc9a21a760c0f00410f56e2592fd507)

---
 source4/torture/unix/whoami.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'source4/torture/unix/whoami.c')

diff --git a/source4/torture/unix/whoami.c b/source4/torture/unix/whoami.c
index 412a256da7..4477713bfe 100644
--- a/source4/torture/unix/whoami.c
+++ b/source4/torture/unix/whoami.c
@@ -25,6 +25,7 @@
 #include "lib/cmdline/popt_common.h"
 #include "auth/credentials/credentials.h"
 #include "param/param.h"
+#include "libcli/resolve/resolve.h"
 
 /* Size (in bytes) of the required fields in the SMBwhoami response. */
 #define WHOAMI_REQUIRED_SIZE	40
@@ -78,7 +79,8 @@ static struct smbcli_state *connect_to_server(struct torture_context *tctx,
 	status = smbcli_full_connection(tctx, &cli, host, 
 					lp_smb_ports(tctx->lp_ctx),
 					share, NULL,
-					creds, NULL);
+					creds, lp_resolve_context(tctx->lp_ctx),
+					NULL);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		printf("failed to connect to //%s/%s: %s\n",
-- 
cgit 


From dcc282590b34537fc1ead61c3300172528273b44 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Thu, 3 Jan 2008 17:22:12 -0600
Subject: r26654: libcli/smb_composite: Rather than specifying each of the
 gazillion options for SMB individually, just specify the smbcli_options
 struct. (This used to be commit 8a97886e24a4b969aa91409c06f423b71a45f6eb)

---
 source4/torture/unix/whoami.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'source4/torture/unix/whoami.c')

diff --git a/source4/torture/unix/whoami.c b/source4/torture/unix/whoami.c
index 4477713bfe..3203f91bc0 100644
--- a/source4/torture/unix/whoami.c
+++ b/source4/torture/unix/whoami.c
@@ -75,12 +75,15 @@ static struct smbcli_state *connect_to_server(struct torture_context *tctx,
 
 	const char *host = torture_setting_string(tctx, "host", NULL);
 	const char *share = torture_setting_string(tctx, "share", NULL);
+	struct smbcli_options options;
+
+	lp_smbcli_options(tctx->lp_ctx, &options);
 
 	status = smbcli_full_connection(tctx, &cli, host, 
 					lp_smb_ports(tctx->lp_ctx),
 					share, NULL,
 					creds, lp_resolve_context(tctx->lp_ctx),
-					NULL);
+					NULL, &options);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		printf("failed to connect to //%s/%s: %s\n",
-- 
cgit 


From afe3e8172ddaa5e4aa811faceecda4f943d6e2ef Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Wed, 2 Apr 2008 04:53:27 +0200
Subject: Install public header files again and include required prototypes.
 (This used to be commit 47ffbbf67435904754469544390b67d34c958343)

---
 source4/torture/unix/whoami.c | 1 +
 1 file changed, 1 insertion(+)

(limited to 'source4/torture/unix/whoami.c')

diff --git a/source4/torture/unix/whoami.c b/source4/torture/unix/whoami.c
index 3203f91bc0..a1333ac5bd 100644
--- a/source4/torture/unix/whoami.c
+++ b/source4/torture/unix/whoami.c
@@ -22,6 +22,7 @@
 #include "torture/basic/proto.h"
 #include "libcli/libcli.h"
 #include "libcli/raw/interfaces.h"
+#include "libcli/raw/raw_proto.h"
 #include "lib/cmdline/popt_common.h"
 #include "auth/credentials/credentials.h"
 #include "param/param.h"
-- 
cgit 


From 4e83011f72ba3df387512755a17760b42a7bf2f2 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Mon, 21 Apr 2008 17:58:23 -0400
Subject: Remove more event_context_init() uses from function calls within deep
 down the code. Make sure we pass around the event_context where we need it
 instead. All test but a few python ones fail. Jelmer promised to fix them.
 (This used to be commit 3045d391626fba169aa26be52174883e18d323e9)

---
 source4/torture/unix/whoami.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source4/torture/unix/whoami.c')

diff --git a/source4/torture/unix/whoami.c b/source4/torture/unix/whoami.c
index a1333ac5bd..d4f19bb57a 100644
--- a/source4/torture/unix/whoami.c
+++ b/source4/torture/unix/whoami.c
@@ -84,7 +84,7 @@ static struct smbcli_state *connect_to_server(struct torture_context *tctx,
 					lp_smb_ports(tctx->lp_ctx),
 					share, NULL,
 					creds, lp_resolve_context(tctx->lp_ctx),
-					NULL, &options);
+					tctx->ev, &options);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		printf("failed to connect to //%s/%s: %s\n",
-- 
cgit 


From d6130413965b53baa07b7b93c9b0d5199cff4437 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 9 Sep 2008 13:01:34 +0200
Subject: UNIX-WHOAMI: fix compiler warnings

metze
(This used to be commit ec5d8ddadb76ff0d2cb72872e4d145a7527f0ec6)
---
 source4/torture/unix/whoami.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source4/torture/unix/whoami.c')

diff --git a/source4/torture/unix/whoami.c b/source4/torture/unix/whoami.c
index d4f19bb57a..39d0a12ab1 100644
--- a/source4/torture/unix/whoami.c
+++ b/source4/torture/unix/whoami.c
@@ -18,11 +18,11 @@
 */
 
 #include "includes.h"
-#include "torture/torture.h"
-#include "torture/basic/proto.h"
 #include "libcli/libcli.h"
 #include "libcli/raw/interfaces.h"
 #include "libcli/raw/raw_proto.h"
+#include "torture/torture.h"
+#include "torture/basic/proto.h"
 #include "lib/cmdline/popt_common.h"
 #include "auth/credentials/credentials.h"
 #include "param/param.h"
-- 
cgit