Adding upstream version 2:4.20.0+dfsg.upstream/2%4.20.0+dfsg

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 1462 insertions, 0 deletions

diff --git a/source4/torture/rap/printing.c b/source4/torture/rap/printing.c
new file mode 100644
index 0000000..af76b26
--- /dev/null
+++ b/source4/torture/rap/printing.c
@@ -0,0 +1,711 @@
+/*
+   Unix SMB/CIFS implementation.
+   test suite for SMB printing operations
+
+   Copyright (C) Guenther Deschner 2010
+
+   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 3 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, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+#include "libcli/raw/libcliraw.h"
+#include "libcli/libcli.h"
+#include "torture/torture.h"
+#include "torture/util.h"
+#include "system/filesys.h"
+
+#include "torture/smbtorture.h"
+#include "torture/util.h"
+#include "libcli/rap/rap.h"
+#include "torture/rap/proto.h"
+#include "param/param.h"
+
+/* TODO:
+
+ printing half the file,
+ finding job
+ delete job
+ try writing 2nd half
+
+ SMBsplretq
+
+*/
+
+#define TORTURE_PRINT_FILE "torture_print_file"
+
+static bool print_printjob(struct torture_context *tctx,
+			   struct smbcli_tree *tree)
+{
+	int fnum;
+	DATA_BLOB data;
+	ssize_t size_written;
+	const char *str;
+
+	torture_comment(tctx, "creating printjob %s\n", TORTURE_PRINT_FILE);
+
+	fnum = smbcli_open(tree, TORTURE_PRINT_FILE, O_RDWR|O_CREAT|O_TRUNC, DENY_NONE);
+	if (fnum == -1) {
+		torture_fail(tctx, "failed to open file");
+	}
+
+	str = talloc_asprintf(tctx, "TortureTestPage: %d\nData\n",0);
+
+	data = data_blob_string_const(str);
+
+	size_written = smbcli_write(tree, fnum, 0, data.data, 0, data.length);
+	if (size_written != data.length) {
+		torture_fail(tctx, "failed to write file");
+	}
+
+	torture_assert_ntstatus_ok(tctx,
+		smbcli_close(tree, fnum),
+		"failed to close file");
+
+	return true;
+}
+
+static bool test_raw_print(struct torture_context *tctx,
+			   struct smbcli_state *cli)
+{
+	return print_printjob(tctx, cli->tree);
+}
+
+static bool test_netprintqenum(struct torture_context *tctx,
+			       struct smbcli_state *cli)
+{
+	struct rap_NetPrintQEnum r;
+	int i, q;
+	uint16_t levels[] = { 0, 1, 2, 3, 4, 5 };
+
+	for (i=0; i < ARRAY_SIZE(levels); i++) {
+
+		r.in.level = levels[i];
+		r.in.bufsize = 8192;
+
+		torture_comment(tctx,
+			"Testing rap_NetPrintQEnum level %d\n", r.in.level);
+
+		torture_assert_ntstatus_ok(tctx,
+			smbcli_rap_netprintqenum(cli->tree, tctx, &r),
+			"smbcli_rap_netprintqenum failed");
+		torture_assert_werr_ok(tctx, W_ERROR(r.out.status),
+			"failed to enum printq");
+
+		for (q=0; q<r.out.count; q++) {
+			switch (r.in.level) {
+			case 0:
+				printf("%s\n", r.out.info[q].info0.PrintQName);
+				break;
+			}
+		}
+	}
+
+	return true;
+}
+
+static bool test_netprintqgetinfo(struct torture_context *tctx,
+				  struct smbcli_state *cli)
+{
+	struct rap_NetPrintQGetInfo r;
+	struct rap_NetPrintQEnum r_enum;
+	int i, p;
+	uint16_t levels[] = { 0, 1, 2, 3, 4, 5 };
+
+	r.in.level = 0;
+	r.in.bufsize = 0;
+	r.in.PrintQueueName = "";
+
+	torture_assert_ntstatus_ok(tctx,
+		smbcli_rap_netprintqgetinfo(cli->tree, tctx, &r),
+		"smbcli_rap_netprintqgetinfo failed");
+	torture_assert_werr_equal(tctx,
+				  W_ERROR(r.out.status),
+				  WERR_INVALID_PARAMETER,
+				  "smbcli_rap_netprintqgetinfo failed");
+
+	r_enum.in.level = 5;
+	r_enum.in.bufsize = 8192;
+
+	torture_assert_ntstatus_ok(tctx,
+		smbcli_rap_netprintqenum(cli->tree, tctx, &r_enum),
+		"failed to enum printq");
+	torture_assert_werr_ok(tctx, W_ERROR(r_enum.out.status),
+		"failed to enum printq");
+
+	for (p=0; p < r_enum.out.count; p++) {
+
+		for (i=0; i < ARRAY_SIZE(levels); i++) {
+
+			r.in.level = levels[i];
+			r.in.bufsize = 8192;
+			r.in.PrintQueueName = r_enum.out.info[p].info5.PrintQueueName;
+
+			torture_comment(tctx, "Testing rap_NetPrintQGetInfo(%s) level %d\n",
+				r.in.PrintQueueName, r.in.level);
+
+			torture_assert_ntstatus_ok(tctx,
+				smbcli_rap_netprintqgetinfo(cli->tree, tctx, &r),
+				"smbcli_rap_netprintqgetinfo failed");
+			torture_assert_werr_ok(tctx,
+				W_ERROR(r.out.status),
+				"smbcli_rap_netprintqgetinfo failed");
+
+			switch (r.in.level) {
+			case 0:
+				printf("%s\n", r.out.info.info0.PrintQName);
+				break;
+			}
+		}
+	}
+
+	return true;
+}
+
+static bool test_netprintjob_pause(struct torture_context *tctx,
+				   struct smbcli_state *cli,
+				   uint16_t job_id)
+{
+	struct rap_NetPrintJobPause r;
+
+	r.in.JobID = job_id;
+
+	torture_comment(tctx, "Testing rap_NetPrintJobPause(%d)\n", r.in.JobID);
+
+	torture_assert_ntstatus_ok(tctx,
+		smbcli_rap_netprintjobpause(cli->tree, tctx, &r),
+		"smbcli_rap_netprintjobpause failed");
+
+	return true;
+}
+
+static bool test_netprintjob_continue(struct torture_context *tctx,
+				      struct smbcli_state *cli,
+				      uint16_t job_id)
+{
+	struct rap_NetPrintJobContinue r;
+
+	r.in.JobID = job_id;
+
+	torture_comment(tctx, "Testing rap_NetPrintJobContinue(%d)\n", r.in.JobID);
+
+	torture_assert_ntstatus_ok(tctx,
+		smbcli_rap_netprintjobcontinue(cli->tree, tctx, &r),
+		"smbcli_rap_netprintjobcontinue failed");
+
+	return true;
+}
+
+static bool test_netprintjob_delete(struct torture_context *tctx,
+				    struct smbcli_state *cli,
+				    uint16_t job_id)
+{
+	struct rap_NetPrintJobDelete r;
+
+	r.in.JobID = job_id;
+
+	torture_comment(tctx, "Testing rap_NetPrintJobDelete(%d)\n", r.in.JobID);
+
+	torture_assert_ntstatus_ok(tctx,
+		smbcli_rap_netprintjobdelete(cli->tree, tctx, &r),
+		"smbcli_rap_netprintjobdelete failed");
+
+	return true;
+}
+
+static bool test_netprintjob(struct torture_context *tctx,
+			     struct smbcli_state *cli)
+{
+	uint16_t job_id = 400;
+
+	torture_assert(tctx,
+		test_netprintjob_pause(tctx, cli, job_id),
+		"failed to pause job");
+	torture_assert(tctx,
+		test_netprintjob_continue(tctx, cli, job_id),
+		"failed to continue job");
+	torture_assert(tctx,
+		test_netprintjob_delete(tctx, cli, job_id),
+		"failed to delete job");
+
+	return true;
+}
+
+static bool test_netprintq_pause(struct torture_context *tctx,
+				 struct smbcli_state *cli,
+				 const char *PrintQueueName)
+{
+	struct rap_NetPrintQueuePause r;
+
+	r.in.PrintQueueName = PrintQueueName;
+
+	torture_comment(tctx, "Testing rap_NetPrintQueuePause(%s)\n", r.in.PrintQueueName);
+
+	torture_assert_ntstatus_ok(tctx,
+		smbcli_rap_netprintqueuepause(cli->tree, tctx, &r),
+		"smbcli_rap_netprintqueuepause failed");
+	torture_assert_werr_ok(tctx, W_ERROR(r.out.status),
+		"smbcli_rap_netprintqueuepause failed");
+
+	return true;
+}
+
+static bool test_netprintq_resume(struct torture_context *tctx,
+				  struct smbcli_state *cli,
+				  const char *PrintQueueName)
+{
+	struct rap_NetPrintQueueResume r;
+
+	r.in.PrintQueueName = PrintQueueName;
+
+	torture_comment(tctx, "Testing rap_NetPrintQueueResume(%s)\n", r.in.PrintQueueName);
+
+	torture_assert_ntstatus_ok(tctx,
+		smbcli_rap_netprintqueueresume(cli->tree, tctx, &r),
+		"smbcli_rap_netprintqueueresume failed");
+	torture_assert_werr_ok(tctx, W_ERROR(r.out.status),
+		"smbcli_rap_netprintqueueresume failed");
+
+	return true;
+}
+
+static bool test_netprintq(struct torture_context *tctx,
+			   struct smbcli_state *cli)
+{
+	struct rap_NetPrintQEnum r;
+	int i;
+
+	r.in.level = 5;
+	r.in.bufsize = 8192;
+
+	torture_assert_ntstatus_ok(tctx,
+		smbcli_rap_netprintqenum(cli->tree, tctx, &r),
+		"failed to enum printq");
+	torture_assert_werr_ok(tctx, W_ERROR(r.out.status),
+		"failed to enum printq");
+
+	for (i=0; i < r.out.count; i++) {
+
+		const char *printqname = r.out.info[i].info5.PrintQueueName;
+
+		torture_assert(tctx,
+			test_netprintq_pause(tctx, cli, printqname),
+			"failed to pause print queue");
+
+		torture_assert(tctx,
+			test_netprintq_resume(tctx, cli, printqname),
+			"failed to resume print queue");
+	}
+
+	return true;
+}
+
+static bool test_netprintjobenum_args(struct torture_context *tctx,
+				      struct smbcli_state *cli,
+				      const char *PrintQueueName,
+				      uint16_t level,
+				      uint16_t *count_p,
+				      union rap_printj_info **info_p)
+{
+	struct rap_NetPrintJobEnum r;
+
+	r.in.PrintQueueName = PrintQueueName;
+	r.in.bufsize = 8192;
+	r.in.level = level;
+
+	torture_comment(tctx,
+		"Testing rap_NetPrintJobEnum(%s) level %d\n", r.in.PrintQueueName, r.in.level);
+
+	torture_assert_ntstatus_ok(tctx,
+		smbcli_rap_netprintjobenum(cli->tree, tctx, &r),
+		"smbcli_rap_netprintjobenum failed");
+
+	if (count_p) {
+		*count_p = r.out.count;
+	}
+	if (info_p) {
+		*info_p = r.out.info;
+	}
+
+	return true;
+}
+
+static bool test_netprintjobenum_one(struct torture_context *tctx,
+				     struct smbcli_state *cli,
+				     const char *PrintQueueName)
+{
+	struct rap_NetPrintJobEnum r;
+	int i;
+	uint16_t levels[] = { 0, 1, 2 };
+
+	r.in.PrintQueueName = PrintQueueName;
+	r.in.bufsize = 8192;
+
+	for (i=0; i < ARRAY_SIZE(levels); i++) {
+
+		r.in.level = levels[i];
+
+		torture_comment(tctx,
+			"Testing rap_NetPrintJobEnum(%s) level %d\n", r.in.PrintQueueName, r.in.level);
+
+		torture_assert_ntstatus_ok(tctx,
+			smbcli_rap_netprintjobenum(cli->tree, tctx, &r),
+			"smbcli_rap_netprintjobenum failed");
+	}
+
+	return true;
+}
+
+static bool test_netprintjobgetinfo_byid(struct torture_context *tctx,
+					 struct smbcli_state *cli,
+					 uint16_t JobID)
+{
+	struct rap_NetPrintJobGetInfo r;
+	uint16_t levels[] = { 0, 1, 2 };
+	int i;
+
+	r.in.JobID = JobID;
+	r.in.bufsize = 8192;
+
+	for (i=0; i < ARRAY_SIZE(levels); i++) {
+
+		r.in.level = levels[i];
+
+		torture_comment(tctx, "Testing rap_NetPrintJobGetInfo(%d) level %d\n", r.in.JobID, r.in.level);
+
+		torture_assert_ntstatus_ok(tctx,
+			smbcli_rap_netprintjobgetinfo(cli->tree, tctx, &r),
+			"smbcli_rap_netprintjobgetinfo failed");
+	}
+
+	return true;
+}
+
+static bool test_netprintjobsetinfo_byid(struct torture_context *tctx,
+					 struct smbcli_state *cli,
+					 uint16_t JobID)
+{
+	struct rap_NetPrintJobSetInfo r;
+	uint16_t levels[] = { 0, 1, 2 };
+	int i;
+	const char *comment = "tortured by samba";
+
+	r.in.JobID = JobID;
+	r.in.bufsize = strlen(comment);
+	r.in.ParamNum = RAP_PARAM_JOBCOMMENT;
+	r.in.Param.string = comment;
+
+	for (i=0; i < ARRAY_SIZE(levels); i++) {
+
+		r.in.level = levels[i];
+
+		torture_comment(tctx, "Testing rap_NetPrintJobSetInfo(%d) level %d\n", r.in.JobID, r.in.level);
+
+		torture_assert_ntstatus_ok(tctx,
+			smbcli_rap_netprintjobsetinfo(cli->tree, tctx, &r),
+			"smbcli_rap_netprintjobsetinfo failed");
+	}
+
+	return true;
+}
+
+
+static bool test_netprintjobgetinfo_byqueue(struct torture_context *tctx,
+					    struct smbcli_state *cli,
+					    const char *PrintQueueName)
+{
+	struct rap_NetPrintJobEnum r;
+	int i;
+
+	r.in.PrintQueueName = PrintQueueName;
+	r.in.bufsize = 8192;
+	r.in.level = 0;
+
+	torture_assert_ntstatus_ok(tctx,
+		smbcli_rap_netprintjobenum(cli->tree, tctx, &r),
+		"failed to enumerate jobs");
+
+	for (i=0; i < r.out.count; i++) {
+
+		torture_assert(tctx,
+			test_netprintjobgetinfo_byid(tctx, cli, r.out.info[i].info0.JobID),
+			"failed to get job info");
+	}
+
+	return true;
+}
+
+static bool test_netprintjobsetinfo_byqueue(struct torture_context *tctx,
+					    struct smbcli_state *cli,
+					    const char *PrintQueueName)
+{
+	struct rap_NetPrintJobEnum r;
+	int i;
+
+	r.in.PrintQueueName = PrintQueueName;
+	r.in.bufsize = 8192;
+	r.in.level = 0;
+
+	torture_assert_ntstatus_ok(tctx,
+		smbcli_rap_netprintjobenum(cli->tree, tctx, &r),
+		"failed to enumerate jobs");
+
+	for (i=0; i < r.out.count; i++) {
+
+		torture_assert(tctx,
+			test_netprintjobsetinfo_byid(tctx, cli, r.out.info[i].info0.JobID),
+			"failed to set job info");
+	}
+
+	return true;
+}
+
+static bool test_netprintjobenum(struct torture_context *tctx,
+				 struct smbcli_state *cli)
+{
+	struct rap_NetPrintQEnum r;
+	int i;
+
+	r.in.level = 5;
+	r.in.bufsize = 8192;
+
+	torture_assert_ntstatus_ok(tctx,
+		smbcli_rap_netprintqenum(cli->tree, tctx, &r),
+		"failed to enum printq");
+	torture_assert_werr_ok(tctx, W_ERROR(r.out.status),
+		"failed to enum printq");
+
+	for (i=0; i < r.out.count; i++) {
+
+		const char *printqname = r.out.info[i].info5.PrintQueueName;
+
+		torture_assert(tctx,
+			test_netprintjobenum_one(tctx, cli, printqname),
+			"failed to enumerate printjobs on print queue");
+	}
+
+	return true;
+}
+
+static bool test_netprintjobgetinfo(struct torture_context *tctx,
+				    struct smbcli_state *cli)
+{
+	struct rap_NetPrintQEnum r;
+	int i;
+
+	r.in.level = 5;
+	r.in.bufsize = 8192;
+
+	torture_assert_ntstatus_ok(tctx,
+		smbcli_rap_netprintqenum(cli->tree, tctx, &r),
+		"failed to enum printq");
+	torture_assert_werr_ok(tctx, W_ERROR(r.out.status),
+		"failed to enum printq");
+
+	for (i=0; i < r.out.count; i++) {
+
+		const char *printqname = r.out.info[i].info5.PrintQueueName;
+
+		torture_assert(tctx,
+			test_netprintjobgetinfo_byqueue(tctx, cli, printqname),
+			"failed to enumerate printjobs on print queue");
+	}
+
+	return true;
+}
+
+static bool test_netprintjobsetinfo(struct torture_context *tctx,
+				    struct smbcli_state *cli)
+{
+	struct rap_NetPrintQEnum r;
+	int i;
+
+	r.in.level = 5;
+	r.in.bufsize = 8192;
+
+	torture_assert_ntstatus_ok(tctx,
+		smbcli_rap_netprintqenum(cli->tree, tctx, &r),
+		"failed to enum printq");
+	torture_assert_werr_ok(tctx, W_ERROR(r.out.status),
+		"failed to enum printq");
+
+	for (i=0; i < r.out.count; i++) {
+
+		const char *printqname = r.out.info[i].info5.PrintQueueName;
+
+		torture_assert(tctx,
+			test_netprintjobsetinfo_byqueue(tctx, cli, printqname),
+			"failed to set printjobs on print queue");
+	}
+
+	return true;
+}
+
+static bool test_netprintdestenum(struct torture_context *tctx,
+				  struct smbcli_state *cli)
+{
+	struct rap_NetPrintDestEnum r;
+	int i;
+	uint16_t levels[] = { 0, 1, 2, 3 };
+
+	for (i=0; i < ARRAY_SIZE(levels); i++) {
+
+		r.in.level = levels[i];
+		r.in.bufsize = 8192;
+
+		torture_comment(tctx,
+			"Testing rap_NetPrintDestEnum level %d\n", r.in.level);
+
+		torture_assert_ntstatus_ok(tctx,
+			smbcli_rap_netprintdestenum(cli->tree, tctx, &r),
+			"smbcli_rap_netprintdestenum failed");
+	}
+
+	return true;
+}
+
+static bool test_netprintdestgetinfo_bydest(struct torture_context *tctx,
+					    struct smbcli_state *cli,
+					    const char *PrintDestName)
+{
+	struct rap_NetPrintDestGetInfo r;
+	int i;
+	uint16_t levels[] = { 0, 1, 2, 3 };
+
+	for (i=0; i < ARRAY_SIZE(levels); i++) {
+
+		r.in.PrintDestName = PrintDestName;
+		r.in.level = levels[i];
+		r.in.bufsize = 8192;
+
+		torture_comment(tctx,
+			"Testing rap_NetPrintDestGetInfo(%s) level %d\n", r.in.PrintDestName, r.in.level);
+
+		torture_assert_ntstatus_ok(tctx,
+			smbcli_rap_netprintdestgetinfo(cli->tree, tctx, &r),
+			"smbcli_rap_netprintdestgetinfo failed");
+	}
+
+	return true;
+}
+
+
+static bool test_netprintdestgetinfo(struct torture_context *tctx,
+				     struct smbcli_state *cli)
+{
+	struct rap_NetPrintDestEnum r;
+	int i;
+
+	r.in.level = 2;
+	r.in.bufsize = 8192;
+
+	torture_comment(tctx,
+		"Testing rap_NetPrintDestEnum level %d\n", r.in.level);
+
+	torture_assert_ntstatus_ok(tctx,
+		smbcli_rap_netprintdestenum(cli->tree, tctx, &r),
+		"smbcli_rap_netprintdestenum failed");
+
+	for (i=0; i < r.out.count; i++) {
+
+		torture_assert(tctx,
+			test_netprintdestgetinfo_bydest(tctx, cli, r.out.info[i].info2.PrinterName),
+			"failed to get printdest info");
+
+	}
+
+	return true;
+}
+
+static bool test_rap_print(struct torture_context *tctx,
+			   struct smbcli_state *cli)
+{
+	struct rap_NetPrintQEnum r;
+	int i;
+
+	r.in.level = 5;
+	r.in.bufsize = 8192;
+
+	torture_assert_ntstatus_ok(tctx,
+		smbcli_rap_netprintqenum(cli->tree, tctx, &r),
+		"failed to enum printq");
+	torture_assert_werr_ok(tctx, W_ERROR(r.out.status),
+		"failed to enum printq");
+
+	for (i=0; i < r.out.count; i++) {
+
+		const char *printqname = r.out.info[i].info5.PrintQueueName;
+		struct smbcli_tree *res_queue = NULL;
+		uint16_t num_jobs;
+		union rap_printj_info *job_info;
+		int j;
+
+		torture_assert(tctx,
+			test_netprintq_pause(tctx, cli, printqname),
+			"failed to set printjobs on print queue");
+
+		torture_assert_ntstatus_ok(tctx,
+			torture_second_tcon(tctx, cli->session, printqname, &res_queue),
+			"failed to open 2nd connection");
+
+		torture_assert(tctx,
+			print_printjob(tctx, res_queue),
+			"failed to print job on 2nd connection");
+
+		talloc_free(res_queue);
+
+		torture_assert(tctx,
+			test_netprintjobenum_args(tctx, cli, printqname, 1,
+			&num_jobs, &job_info),
+			"failed to enum printjobs on print queue");
+
+		for (j=0; j < num_jobs; j++) {
+
+			uint16_t job_id = job_info[j].info1.JobID;
+
+			torture_assert(tctx,
+				test_netprintjobgetinfo_byid(tctx, cli, job_id),
+				"failed to getinfo on new printjob");
+
+			torture_assert(tctx,
+				test_netprintjob_delete(tctx, cli, job_id),
+				"failed to delete job");
+		}
+
+		torture_assert(tctx,
+			test_netprintq_resume(tctx, cli, printqname),
+			"failed to resume print queue");
+
+	}
+
+	return true;
+}
+
+struct torture_suite *torture_rap_printing(TALLOC_CTX *mem_ctx)
+{
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "printing");
+
+	torture_suite_add_1smb_test(suite, "raw_print", test_raw_print);
+	torture_suite_add_1smb_test(suite, "rap_print", test_rap_print);
+	torture_suite_add_1smb_test(suite, "rap_printq_enum", test_netprintqenum);
+	torture_suite_add_1smb_test(suite, "rap_printq_getinfo", test_netprintqgetinfo);
+	torture_suite_add_1smb_test(suite, "rap_printq", test_netprintq);
+	torture_suite_add_1smb_test(suite, "rap_printjob_enum", test_netprintjobenum);
+	torture_suite_add_1smb_test(suite, "rap_printjob_getinfo", test_netprintjobgetinfo);
+	torture_suite_add_1smb_test(suite, "rap_printjob_setinfo", test_netprintjobsetinfo);
+	torture_suite_add_1smb_test(suite, "rap_printjob", test_netprintjob);
+	torture_suite_add_1smb_test(suite, "rap_printdest_enum", test_netprintdestenum);
+	torture_suite_add_1smb_test(suite, "rap_printdest_getinfo", test_netprintdestgetinfo);
+
+	return suite;
+}
diff --git a/source4/torture/rap/rap.c b/source4/torture/rap/rap.c
new file mode 100644
index 0000000..054e011
--- /dev/null
+++ b/source4/torture/rap/rap.c
@@ -0,0 +1,275 @@
+/* 
+   Unix SMB/CIFS implementation.
+   test suite for various RAP operations
+   Copyright (C) Volker Lendecke 2004
+   Copyright (C) Tim Potter 2005
+   Copyright (C) Jelmer Vernooij 2007
+   Copyright (C) Guenther Deschner 2010
+   
+   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 3 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, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+#include "libcli/libcli.h"
+#include "torture/smbtorture.h"
+#include "torture/util.h"
+#include "param/param.h"
+#include "libcli/rap/rap.h"
+#include "torture/rap/proto.h"
+
+static bool test_netshareenum(struct torture_context *tctx, 
+			      struct smbcli_state *cli)
+{
+	struct rap_NetShareEnum r;
+	int i;
+
+	r.in.level = 1;
+	r.in.bufsize = 8192;
+
+	torture_assert_ntstatus_ok(tctx, 
+		smbcli_rap_netshareenum(cli->tree, tctx, &r), "");
+
+	for (i=0; i<r.out.count; i++) {
+		printf("%s %d %s\n", r.out.info[i].info1.share_name,
+		       r.out.info[i].info1.share_type,
+		       r.out.info[i].info1.comment);
+	}
+
+	return true;
+}
+
+static bool test_netserverenum(struct torture_context *tctx, 
+			       struct smbcli_state *cli)
+{
+	struct rap_NetServerEnum2 r;
+	int i;
+
+	r.in.level = 0;
+	r.in.bufsize = 8192;
+	r.in.servertype = 0xffffffff;
+	r.in.servertype = 0x80000000;
+	r.in.domain = NULL;
+
+	torture_assert_ntstatus_ok(tctx, 
+		   smbcli_rap_netserverenum2(cli->tree, tctx, &r), "");
+
+	for (i=0; i<r.out.count; i++) {
+		switch (r.in.level) {
+		case 0:
+			printf("%s\n", r.out.info[i].info0.name);
+			break;
+		case 1:
+			printf("%s %x %s\n", r.out.info[i].info1.name,
+			       r.out.info[i].info1.servertype,
+			       r.out.info[i].info1.comment);
+			break;
+		}
+	}
+
+	return true;
+}
+
+static bool test_netservergetinfo(struct torture_context *tctx, 
+				  struct smbcli_state *cli)
+{
+	struct rap_WserverGetInfo r;
+	bool res = true;
+
+	r.in.bufsize = 0xffff;
+
+	r.in.level = 0;
+	torture_assert_ntstatus_ok(tctx,
+		smbcli_rap_netservergetinfo(cli->tree, tctx, &r),
+		"rap_netservergetinfo level 0 failed");
+	torture_assert_werr_ok(tctx, W_ERROR(r.out.status),
+		"rap_netservergetinfo level 0 failed");
+
+	r.in.level = 1;
+	torture_assert_ntstatus_ok(tctx,
+		smbcli_rap_netservergetinfo(cli->tree, tctx, &r),
+		"rap_netservergetinfo level 1 failed");
+	torture_assert_werr_ok(tctx, W_ERROR(r.out.status),
+		"rap_netservergetinfo level 1 failed");
+
+	return res;
+}
+
+static bool test_netsessionenum(struct torture_context *tctx,
+				struct smbcli_state *cli)
+{
+	struct rap_NetSessionEnum r;
+	int i,n;
+	uint16_t levels[] = { 2 };
+
+	for (i=0; i < ARRAY_SIZE(levels); i++) {
+
+		r.in.level = levels[i];
+		r.in.bufsize = 8192;
+
+		torture_comment(tctx,
+			"Testing rap_NetSessionEnum level %d\n", r.in.level);
+
+		torture_assert_ntstatus_ok(tctx,
+			smbcli_rap_netsessionenum(cli->tree, tctx, &r),
+			"smbcli_rap_netsessionenum failed");
+		torture_assert_werr_ok(tctx, W_ERROR(r.out.status),
+			"smbcli_rap_netsessionenum failed");
+
+		for (n=0; n < r.out.count; n++) {
+			switch (r.in.level) {
+			case 2:
+				torture_comment(tctx, "ComputerName: %s\n",
+					r.out.info[n].info2.ComputerName);
+
+				torture_comment(tctx, "UserName: %s\n",
+					r.out.info[n].info2.UserName);
+
+				torture_assert(tctx, r.out.info[n].info2.ComputerName,
+					"ComputerName empty");
+				torture_assert(tctx, r.out.info[n].info2.UserName,
+					"UserName empty");
+				break;
+			default:
+				break;
+			}
+		}
+	}
+
+	return true;
+}
+
+static bool test_netsessiongetinfo_bysession(struct torture_context *tctx,
+					     struct smbcli_state *cli,
+					     const char *session)
+{
+	struct rap_NetSessionGetInfo r;
+	int i;
+	uint16_t levels[] = { 2 };
+
+	if (session && session[0] == '\\' && session[1] == '\\') {
+		r.in.SessionName = session;
+	} else {
+		r.in.SessionName = talloc_asprintf(tctx, "\\\\%s", session);
+	}
+	r.in.bufsize = 0xffff;
+
+	for (i=0; i < ARRAY_SIZE(levels); i++) {
+
+		r.in.level = levels[i];
+
+		torture_assert_ntstatus_ok(tctx,
+			smbcli_rap_netsessiongetinfo(cli->tree, tctx, &r),
+			"rap_netsessiongetinfo failed");
+		torture_assert_werr_ok(tctx, W_ERROR(r.out.status),
+			"rap_netsessiongetinfo failed");
+	}
+
+	return true;
+}
+
+static bool test_netsessiongetinfo(struct torture_context *tctx,
+				   struct smbcli_state *cli)
+{
+	struct rap_NetSessionEnum r;
+	int i,n;
+	uint16_t levels[] = { 2 };
+
+	for (i=0; i < ARRAY_SIZE(levels); i++) {
+
+		r.in.level = levels[i];
+		r.in.bufsize = 8192;
+
+		torture_assert_ntstatus_ok(tctx,
+			smbcli_rap_netsessionenum(cli->tree, tctx, &r),
+			"smbcli_rap_netsessionenum failed");
+		torture_assert_werr_ok(tctx, W_ERROR(r.out.status),
+			"smbcli_rap_netsessionenum failed");
+
+		for (n=0; n < r.out.count; n++) {
+			torture_assert(tctx,
+				test_netsessiongetinfo_bysession(tctx, cli, r.out.info[n].info2.ComputerName),
+				"failed to query sessioninfo");
+		}
+	}
+
+	return true;
+}
+
+static bool test_netremotetod(struct torture_context *tctx,
+			      struct smbcli_state *cli)
+{
+	struct rap_NetRemoteTOD r;
+
+	r.in.bufsize = 8192;
+
+	torture_assert_ntstatus_ok(tctx,
+		smbcli_rap_netremotetod(cli->tree, tctx, &r),
+		"smbcli_rap_netremotetod failed");
+	torture_assert_werr_ok(tctx, W_ERROR(r.out.status),
+		"smbcli_rap_netremotetod failed");
+
+	return true;
+}
+
+bool torture_rap_scan(struct torture_context *torture, struct smbcli_state *cli)
+{
+	int callno;
+
+	for (callno = 0; callno < 0xffff; callno++) {
+		struct rap_call *call = new_rap_cli_call(torture, callno);
+		NTSTATUS result;
+
+		result = rap_cli_do_call(cli->tree, call);
+
+		if (!NT_STATUS_EQUAL(result, NT_STATUS_INVALID_PARAMETER))
+			continue;
+
+		printf("callno %d is RAP call\n", callno);
+	}
+
+	return true;
+}
+
+NTSTATUS torture_rap_init(TALLOC_CTX *ctx)
+{
+	struct torture_suite *suite = torture_suite_create(ctx, "rap");
+	struct torture_suite *suite_basic = torture_suite_create(suite, "basic");
+
+	torture_suite_add_suite(suite, suite_basic);
+	torture_suite_add_suite(suite, torture_rap_rpc(suite));
+	torture_suite_add_suite(suite, torture_rap_printing(suite));
+	torture_suite_add_suite(suite, torture_rap_sam(suite));
+
+	torture_suite_add_1smb_test(suite_basic, "netserverenum", 
+				    test_netserverenum);
+	torture_suite_add_1smb_test(suite_basic, "netshareenum",
+				    test_netshareenum);
+	torture_suite_add_1smb_test(suite_basic, "netservergetinfo",
+				    test_netservergetinfo);
+	torture_suite_add_1smb_test(suite_basic, "netsessionenum",
+				    test_netsessionenum);
+	torture_suite_add_1smb_test(suite_basic, "netsessiongetinfo",
+				    test_netsessiongetinfo);
+	torture_suite_add_1smb_test(suite_basic, "netremotetod",
+				    test_netremotetod);
+
+	torture_suite_add_1smb_test(suite, "scan", torture_rap_scan);
+
+	suite->description = talloc_strdup(suite, 
+						"Remote Administration Protocol tests");
+
+	torture_register_suite(ctx, suite);
+
+	return NT_STATUS_OK;
+}
diff --git a/source4/torture/rap/rpc.c b/source4/torture/rap/rpc.c
new file mode 100644
index 0000000..6c8c86c
--- /dev/null
+++ b/source4/torture/rap/rpc.c
@@ -0,0 +1,100 @@
+/*
+   Unix SMB/CIFS implementation.
+   test suite for RAP / DCERPC consistency
+   Copyright (C) Guenther Deschner 2010
+
+   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 3 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, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+#include "libcli/libcli.h"
+#include "torture/smbtorture.h"
+#include "torture/util.h"
+#include "libcli/rap/rap.h"
+#include "torture/rap/proto.h"
+#include "param/param.h"
+#include "torture/rpc/torture_rpc.h"
+#include "librpc/gen_ndr/ndr_srvsvc_c.h"
+
+static bool test_rpc_netservergetinfo(struct torture_context *tctx,
+				      struct smbcli_state *cli)
+{
+	struct rap_WserverGetInfo r;
+	struct dcerpc_pipe *p;
+	struct dcerpc_binding_handle *b;
+	struct srvsvc_NetSrvGetInfo s;
+	union srvsvc_NetSrvInfo info;
+
+	const char *server_name;
+
+	torture_assert_ntstatus_ok(tctx,
+		torture_rpc_connection(tctx, &p, &ndr_table_srvsvc),
+		"failed to open srvsvc");
+
+	b = p->binding_handle;
+
+	s.in.server_unc = NULL;
+	s.in.level = 101;
+	s.out.info = &info;
+
+	torture_assert_ntstatus_ok(tctx,
+		dcerpc_srvsvc_NetSrvGetInfo_r(b, tctx, &s),
+		"srvsvc_NetSrvGetInfo level 101 failed");
+	torture_assert_werr_ok(tctx, s.out.result,
+		"srvsvc_NetSrvGetInfo level 101 failed");
+
+	r.in.bufsize = 0xffff;
+	r.in.level = 0;
+
+	torture_assert_ntstatus_ok(tctx,
+		smbcli_rap_netservergetinfo(cli->tree, tctx, &r),
+		"rap_netservergetinfo level 0 failed");
+	torture_assert_int_equal(tctx, r.out.status, 0,
+		"rap_netservergetinfo level 0 failed");
+
+	server_name = talloc_strndup(tctx, info.info101->server_name, 16);
+
+	torture_assert_str_equal(tctx, (const char *)r.out.info.info0.name, server_name, "server name");
+
+	r.in.level = 1;
+
+	torture_assert_ntstatus_ok(tctx,
+		smbcli_rap_netservergetinfo(cli->tree, tctx, &r),
+		"rap_netservergetinfo level 1 failed");
+	torture_assert_int_equal(tctx, r.out.status, 0,
+		"rap_netservergetinfo level 1 failed");
+
+	torture_assert_str_equal(tctx, (const char *)r.out.info.info1.name, server_name, "server name");
+	torture_assert_int_equal(tctx, r.out.info.info1.version_major, info.info101->version_major, "version major");
+	torture_assert_int_equal(tctx, r.out.info.info1.version_minor, info.info101->version_minor, "version minor");
+	torture_assert_int_equal(tctx, r.out.info.info1.servertype, info.info101->server_type, "server_type");
+	torture_assert_str_equal(tctx, r.out.info.info1.comment, info.info101->comment, "comment");
+
+	talloc_free(p);
+
+	return true;
+}
+
+struct torture_suite *torture_rap_rpc(TALLOC_CTX *mem_ctx)
+{
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "rpc");
+
+	torture_suite_add_1smb_test(suite, "netservergetinfo",
+				    test_rpc_netservergetinfo);
+
+	suite->description = talloc_strdup(suite,
+					   "RAP / DCERPC consistency tests");
+
+	return suite;
+}
diff --git a/source4/torture/rap/sam.c b/source4/torture/rap/sam.c
new file mode 100644
index 0000000..3c13849
--- /dev/null
+++ b/source4/torture/rap/sam.c
@@ -0,0 +1,376 @@
+/*
+   Unix SMB/CIFS implementation.
+   test suite for RAP sam operations
+
+   Copyright (C) Guenther Deschner 2010-2011
+
+   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 3 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, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "includes.h"
+#include "libcli/libcli.h"
+#include "torture/torture.h"
+#include "torture/util.h"
+#include "torture/smbtorture.h"
+#include "torture/util.h"
+#include "libcli/rap/rap.h"
+#include "torture/rap/proto.h"
+#include "../libcli/auth/libcli_auth.h"
+#include "torture/rpc/torture_rpc.h"
+
+#include <gnutls/gnutls.h>
+#include <gnutls/crypto.h>
+
+#define TEST_RAP_USER "torture_rap_user"
+
+static char *samr_rand_pass(TALLOC_CTX *mem_ctx, int min_len)
+{
+	size_t len = MAX(8, min_len);
+	char *s = generate_random_password(mem_ctx, len, len+6);
+	printf("Generated password '%s'\n", s);
+	return s;
+}
+
+static bool test_userpasswordset2_args(struct torture_context *tctx,
+				       struct smbcli_state *cli,
+				       const char *username,
+				       const char **password)
+{
+	struct rap_NetUserPasswordSet2 r;
+	char *newpass = samr_rand_pass(tctx, 8);
+
+	ZERO_STRUCT(r);
+
+	r.in.UserName = username;
+
+	memcpy(r.in.OldPassword, *password, MIN(strlen(*password), 16));
+	memcpy(r.in.NewPassword, newpass, MIN(strlen(newpass), 16));
+	r.in.EncryptedPassword = 0;
+	r.in.RealPasswordLength = strlen(newpass);
+
+	torture_comment(tctx, "Testing rap_NetUserPasswordSet2(%s)\n", r.in.UserName);
+
+	torture_assert_ntstatus_ok(tctx,
+		smbcli_rap_netuserpasswordset2(cli->tree, tctx, &r),
+		"smbcli_rap_netuserpasswordset2 failed");
+	if (!W_ERROR_IS_OK(W_ERROR(r.out.status))) {
+		torture_warning(tctx, "RAP NetUserPasswordSet2 gave: %s\n",
+			win_errstr(W_ERROR(r.out.status)));
+	} else {
+		*password = newpass;
+	}
+
+	return true;
+}
+
+static bool test_userpasswordset2_crypt_args(struct torture_context *tctx,
+					     struct smbcli_state *cli,
+					     const char *username,
+					     const char **password)
+{
+	struct rap_NetUserPasswordSet2 r;
+	char *newpass = samr_rand_pass(tctx, 8);
+
+	r.in.UserName = username;
+
+	E_deshash(*password, r.in.OldPassword);
+	E_deshash(newpass, r.in.NewPassword);
+
+	r.in.RealPasswordLength = strlen(newpass);
+	r.in.EncryptedPassword = 1;
+
+	torture_comment(tctx, "Testing rap_NetUserPasswordSet2(%s)\n", r.in.UserName);
+
+	torture_assert_ntstatus_ok(tctx,
+		smbcli_rap_netuserpasswordset2(cli->tree, tctx, &r),
+		"smbcli_rap_netuserpasswordset2 failed");
+	if (!W_ERROR_IS_OK(W_ERROR(r.out.status))) {
+		torture_warning(tctx, "RAP NetUserPasswordSet2 gave: %s\n",
+			win_errstr(W_ERROR(r.out.status)));
+	} else {
+		*password = newpass;
+	}
+
+	return true;
+}
+
+static bool test_userpasswordset2(struct torture_context *tctx,
+				  struct smbcli_state *cli)
+{
+	struct test_join *join_ctx;
+	const char *password;
+	bool ret = true;
+
+	join_ctx = torture_create_testuser_max_pwlen(tctx, TEST_RAP_USER,
+						     torture_setting_string(tctx, "workgroup", NULL),
+						     ACB_NORMAL,
+						     &password, 14);
+	if (join_ctx == NULL) {
+		torture_fail(tctx, "failed to create user\n");
+	}
+
+	ret &= test_userpasswordset2_args(tctx, cli, TEST_RAP_USER, &password);
+	ret &= test_userpasswordset2_crypt_args(tctx, cli, TEST_RAP_USER, &password);
+
+	torture_leave_domain(tctx, join_ctx);
+
+	return ret;
+}
+
+static bool test_oemchangepassword_args(struct torture_context *tctx,
+					struct smbcli_state *cli,
+					const char *username,
+					const char **password)
+{
+	struct rap_NetOEMChangePassword r;
+
+	const char *oldpass = *password;
+	char *newpass = samr_rand_pass(tctx, 9);
+	uint8_t old_pw_hash[16];
+	uint8_t new_pw_hash[16];
+	gnutls_cipher_hd_t cipher_hnd = NULL;
+	gnutls_datum_t pw_key = {
+		.data = old_pw_hash,
+		.size = sizeof(old_pw_hash),
+	};
+
+	r.in.UserName = username;
+
+	E_deshash(oldpass, old_pw_hash);
+	E_deshash(newpass, new_pw_hash);
+
+	encode_pw_buffer(r.in.crypt_password, newpass, STR_ASCII);
+
+	gnutls_cipher_init(&cipher_hnd,
+			   GNUTLS_CIPHER_ARCFOUR_128,
+			   &pw_key,
+			   NULL);
+	gnutls_cipher_encrypt(cipher_hnd,
+			      r.in.crypt_password,
+			      516);
+	gnutls_cipher_deinit(cipher_hnd);
+	E_old_pw_hash(new_pw_hash, old_pw_hash, r.in.password_hash);
+
+	torture_comment(tctx, "Testing rap_NetOEMChangePassword(%s)\n", r.in.UserName);
+
+	torture_assert_ntstatus_ok(tctx,
+		smbcli_rap_netoemchangepassword(cli->tree, tctx, &r),
+		"smbcli_rap_netoemchangepassword failed");
+	if (!W_ERROR_IS_OK(W_ERROR(r.out.status))) {
+		torture_warning(tctx, "RAP NetOEMChangePassword gave: %s\n",
+			win_errstr(W_ERROR(r.out.status)));
+	} else {
+		*password = newpass;
+	}
+
+	return true;
+}
+
+static bool test_oemchangepassword(struct torture_context *tctx,
+				   struct smbcli_state *cli)
+{
+
+	struct test_join *join_ctx;
+	const char *password;
+	bool ret;
+
+	join_ctx = torture_create_testuser_max_pwlen(tctx, TEST_RAP_USER,
+						     torture_setting_string(tctx, "workgroup", NULL),
+						     ACB_NORMAL,
+						     &password, 14);
+	if (join_ctx == NULL) {
+		torture_fail(tctx, "failed to create user\n");
+	}
+
+	ret = test_oemchangepassword_args(tctx, cli, TEST_RAP_USER, &password);
+
+	torture_leave_domain(tctx, join_ctx);
+
+	return ret;
+}
+
+static bool test_usergetinfo_byname(struct torture_context *tctx,
+				    struct smbcli_state *cli,
+				    const char *UserName)
+{
+	struct rap_NetUserGetInfo r;
+	int i;
+	uint16_t levels[] = { 0, 1, 2, 10, 11 };
+
+	for (i=0; i < ARRAY_SIZE(levels); i++) {
+
+		r.in.UserName = UserName;
+		r.in.level = levels[i];
+		r.in.bufsize = 8192;
+
+		torture_comment(tctx,
+			"Testing rap_NetUserGetInfo(%s) level %d\n", r.in.UserName, r.in.level);
+
+		torture_assert_ntstatus_ok(tctx,
+			smbcli_rap_netusergetinfo(cli->tree, tctx, &r),
+			"smbcli_rap_netusergetinfo failed");
+		torture_assert_werr_ok(tctx, W_ERROR(r.out.status),
+			"smbcli_rap_netusergetinfo failed");
+	}
+
+	return true;
+}
+
+static bool test_usergetinfo(struct torture_context *tctx,
+			     struct smbcli_state *cli)
+{
+
+	struct test_join *join_ctx;
+	const char *password;
+	bool ret;
+
+	join_ctx = torture_create_testuser_max_pwlen(tctx, TEST_RAP_USER,
+						     torture_setting_string(tctx, "workgroup", NULL),
+						     ACB_NORMAL,
+						     &password, 14);
+	if (join_ctx == NULL) {
+		torture_fail(tctx, "failed to create user\n");
+	}
+
+	ret = test_usergetinfo_byname(tctx, cli, TEST_RAP_USER);
+
+	torture_leave_domain(tctx, join_ctx);
+
+	return ret;
+}
+
+static bool test_useradd(struct torture_context *tctx,
+			 struct smbcli_state *cli)
+{
+
+	struct rap_NetUserAdd r;
+	struct rap_NetUserInfo1 info1;
+	int i;
+	uint16_t levels[] = { 1 };
+	const char *username = TEST_RAP_USER;
+
+	for (i=0; i < ARRAY_SIZE(levels); i++) {
+
+		const char *pwd;
+
+		pwd = generate_random_password(tctx, 9, 16);
+
+		r.in.level = levels[i];
+		r.in.bufsize = 0xffff;
+		r.in.pwdlength = strlen(pwd);
+		r.in.unknown = 0;
+
+		switch (r.in.level) {
+		case 1:
+			ZERO_STRUCT(info1);
+
+			info1.Name = username;
+			memcpy(info1.Password, pwd, MIN(strlen(pwd), 16));
+			info1.Priv = USER_PRIV_USER;
+			info1.Flags = 0x21;
+			info1.HomeDir = "home_dir";
+			info1.Comment = "comment";
+			info1.ScriptPath = "logon_script";
+
+			r.in.info.info1 = info1;
+			break;
+		}
+
+		torture_comment(tctx,
+			"Testing rap_NetUserAdd(%s) level %d\n", username, r.in.level);
+
+		torture_assert_ntstatus_ok(tctx,
+			smbcli_rap_netuseradd(cli->tree, tctx, &r),
+			"smbcli_rap_netuseradd failed");
+		torture_assert_werr_ok(tctx, W_ERROR(r.out.status),
+			"smbcli_rap_netuseradd failed");
+
+		torture_assert_ntstatus_ok(tctx,
+			smbcli_rap_netuseradd(cli->tree, tctx, &r),
+			"2nd smbcli_rap_netuseradd failed");
+		torture_assert_werr_equal(tctx, W_ERROR(r.out.status), WERR_NERR_USEREXISTS,
+			"2nd smbcli_rap_netuseradd failed");
+
+		{
+			struct rap_NetUserDelete d;
+
+			d.in.UserName = username;
+
+			smbcli_rap_netuserdelete(cli->tree, tctx, &d);
+		}
+	}
+
+	return true;
+}
+
+static bool test_userdelete(struct torture_context *tctx,
+			    struct smbcli_state *cli)
+{
+
+	struct rap_NetUserDelete r;
+
+	{
+		struct rap_NetUserAdd a;
+		const char *pwd;
+
+		ZERO_STRUCT(a.in.info.info1);
+
+		pwd = generate_random_password(tctx, 9, 16);
+
+		a.in.level = 1;
+		a.in.bufsize = 0xffff;
+		a.in.pwdlength = strlen(pwd);
+		a.in.unknown = 0;
+		a.in.info.info1.Name = TEST_RAP_USER;
+		a.in.info.info1.Priv = USER_PRIV_USER;
+
+		memcpy(a.in.info.info1.Password, pwd, MIN(strlen(pwd), 16));
+
+		torture_assert_ntstatus_ok(tctx,
+			smbcli_rap_netuseradd(cli->tree, tctx, &a),
+			"smbcli_rap_netuseradd failed");
+	}
+
+	r.in.UserName = TEST_RAP_USER;
+
+	torture_comment(tctx,
+		"Testing rap_NetUserDelete(%s)\n", r.in.UserName);
+
+	torture_assert_ntstatus_ok(tctx,
+		smbcli_rap_netuserdelete(cli->tree, tctx, &r),
+		"smbcli_rap_netuserdelete failed");
+	torture_assert_werr_ok(tctx, W_ERROR(r.out.status),
+		"smbcli_rap_netuserdelete failed");
+
+	torture_assert_ntstatus_ok(tctx,
+		smbcli_rap_netuserdelete(cli->tree, tctx, &r),
+		"2nd smbcli_rap_netuserdelete failed");
+	torture_assert_werr_equal(tctx, W_ERROR(r.out.status), WERR_NERR_USERNOTFOUND,
+		"2nd smbcli_rap_netuserdelete failed");
+
+	return true;
+}
+
+struct torture_suite *torture_rap_sam(TALLOC_CTX *mem_ctx)
+{
+	struct torture_suite *suite = torture_suite_create(mem_ctx, "sam");
+
+	torture_suite_add_1smb_test(suite, "userpasswordset2", test_userpasswordset2);
+	torture_suite_add_1smb_test(suite, "oemchangepassword", test_oemchangepassword);
+	torture_suite_add_1smb_test(suite, "usergetinfo", test_usergetinfo);
+	torture_suite_add_1smb_test(suite, "useradd", test_useradd);
+	torture_suite_add_1smb_test(suite, "userdelete", test_userdelete);
+
+	return suite;
+}