From 05c0ca23557cf329730887c37cc83fcffdd76796 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 27 Aug 2001 18:01:05 +0000
Subject: forgot to commit the scanner code (This used to be commit
 591308f3881e44750b48602fd05362f1f5c6477a)

---
 source3/torture/scanner.c | 435 ++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 435 insertions(+)
 create mode 100644 source3/torture/scanner.c

(limited to 'source3/torture/scanner.c')

diff --git a/source3/torture/scanner.c b/source3/torture/scanner.c
new file mode 100644
index 0000000000..5c1c59ca8c
--- /dev/null
+++ b/source3/torture/scanner.c
@@ -0,0 +1,435 @@
+/* 
+   Unix SMB/Netbios implementation.
+   Version 3.0
+   SMB torture tester - scanning functions
+   Copyright (C) Andrew Tridgell 2001
+   
+   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.
+*/
+
+#define NO_SYSLOG
+
+#include "includes.h"
+
+#define VERBOSE 0
+#define OP_MIN 0
+#define OP_MAX 20
+
+/****************************************************************************
+look for a partial hit
+****************************************************************************/
+static void trans2_check_hit(char *format, int op, int level, uint32 status)
+{
+	switch (status) {
+	case NT_STATUS_INVALID_LEVEL:
+	case NT_STATUS_NOT_IMPLEMENTED:
+	case NT_STATUS_NOT_SUPPORTED:
+	case NT_STATUS_UNSUCCESSFUL:
+	case NT_STATUS_INVALID_INFO_CLASS:
+		break;
+	default:
+#if VERBOSE
+		printf("possible %s hit op=%3d level=%5d status=%s\n",
+		       format, op, level, get_nt_error_msg(status));
+#endif
+	}
+}
+
+/****************************************************************************
+check for existance of a trans2 call
+****************************************************************************/
+static uint32 try_trans2(struct cli_state *cli, 
+			 int op,
+			 char *param, char *data,
+			 int param_len, int data_len,
+			 int *rparam_len, int *rdata_len)
+{
+	uint16 setup = op;
+	char *rparam=NULL, *rdata=NULL;
+
+	if (!cli_send_trans(cli, SMBtrans2, 
+                            NULL,                           /* name */
+                            -1, 0,                          /* fid, flags */
+                            &setup, 1, 0,                   /* setup, length, max */
+                            param, param_len, 2,            /* param, length, max */
+                            data, data_len, cli->max_xmit   /* data, length, max */
+                           )) {
+		return cli_nt_error(cli);
+	}
+
+	cli_receive_trans(cli, SMBtrans2,
+			   &rparam, rparam_len,
+			   &rdata, rdata_len);
+
+	if (rdata) free(rdata);
+	if (rparam) free(rparam);
+
+	return cli_nt_error(cli);
+}
+
+
+static uint32 try_trans2_len(struct cli_state *cli, 
+			     char *format,
+			     int op, int level,
+			     char *param, char *data,
+			     int param_len, int *data_len,
+			     int *rparam_len, int *rdata_len)
+{
+	uint32 ret=0;
+
+	ret = try_trans2(cli, op, param, data, param_len,
+			 sizeof(pstring), rparam_len, rdata_len);
+#if VERBOSE 
+	printf("op=%d level=%d ret=%s\n", op, level, get_nt_error_msg(ret));
+#endif
+	if (ret != 0) return ret;
+
+	*data_len = 0;
+	while (*data_len < sizeof(pstring)) {
+		ret = try_trans2(cli, op, param, data, param_len,
+				 *data_len, rparam_len, rdata_len);
+		if (ret == 0) break;
+		*data_len += 2;
+	}
+	if (ret == NT_STATUS_NOPROBLEMO) {
+		printf("found %s level=%d data_len=%d rparam_len=%d rdata_len=%d\n",
+		       format, level, *data_len, *rparam_len, *rdata_len);
+	} else {
+		trans2_check_hit(format, op, level, ret);
+	}
+	return ret;
+}
+
+/****************************************************************************
+check for existance of a trans2 call
+****************************************************************************/
+static BOOL scan_trans2(struct cli_state *cli, int op, int level, 
+			int fnum, int dnum, char *fname)
+{
+	int data_len = 0;
+	int param_len = 0;
+	int rparam_len, rdata_len;
+	pstring param, data;
+	uint32 status;
+
+	memset(data, 0, sizeof(data));
+	data_len = 4;
+
+	/* try with a info level only */
+	param_len = 2;
+	SSVAL(param, 0, level);
+	status = try_trans2_len(cli, "void", op, level, param, data, param_len, &data_len, 
+			    &rparam_len, &rdata_len);
+	if (status == 0) return True;
+
+	/* try with a file descriptor */
+	param_len = 6;
+	SSVAL(param, 0, fnum);
+	SSVAL(param, 2, level);
+	SSVAL(param, 4, 0);
+	status = try_trans2_len(cli, "fnum", op, level, param, data, param_len, &data_len, 
+				&rparam_len, &rdata_len);
+	if (status == 0) return True;
+
+
+	/* try with a notify style */
+	param_len = 6;
+	SSVAL(param, 0, dnum);
+	SSVAL(param, 2, dnum);
+	SSVAL(param, 4, level);
+	status = try_trans2_len(cli, "notify", op, level, param, data, param_len, &data_len, 
+				&rparam_len, &rdata_len);
+	if (status == 0) return True;
+
+	/* try with a file name */
+	param_len = 6;
+	SSVAL(param, 0, level);
+	SSVAL(param, 2, 0);
+	SSVAL(param, 4, 0);
+	param_len += clistr_push(cli, &param[6], fname, -1, STR_TERMINATE);
+
+	status = try_trans2_len(cli, "fname", op, level, param, data, param_len, &data_len, 
+				&rparam_len, &rdata_len);
+	if (status == 0) return True;
+
+	/* try with a new file name */
+	param_len = 6;
+	SSVAL(param, 0, level);
+	SSVAL(param, 2, 0);
+	SSVAL(param, 4, 0);
+	param_len += clistr_push(cli, &param[6], "\\newfile.dat", -1, STR_TERMINATE);
+
+	status = try_trans2_len(cli, "newfile", op, level, param, data, param_len, &data_len, 
+				&rparam_len, &rdata_len);
+	cli_unlink(cli, "\\newfile.dat");
+	cli_rmdir(cli, "\\newfile.dat");
+	if (status == 0) return True;
+
+	/* try dfs style  */
+	cli_mkdir(cli, "\\testdir");
+	param_len = 2;
+	SSVAL(param, 0, level);
+	param_len += clistr_push(cli, &param[2], "\\testdir", -1, STR_TERMINATE);
+
+	status = try_trans2_len(cli, "dfs", op, level, param, data, param_len, &data_len, 
+				&rparam_len, &rdata_len);
+	cli_rmdir(cli, "\\testdir");
+	if (status == 0) return True;
+
+	return False;
+}
+
+
+BOOL torture_trans2_scan(int dummy)
+{
+	static struct cli_state cli;
+	int op, level;
+	char *fname = "\\scanner.dat";
+	int fnum, dnum;
+
+	printf("starting trans2 scan test\n");
+
+	if (!torture_open_connection(&cli)) {
+		return False;
+	}
+
+	fnum = cli_open(&cli, fname, O_RDWR | O_CREAT | O_TRUNC, 
+			 DENY_NONE);
+	dnum = cli_open(&cli, "\\", O_RDONLY, DENY_NONE);
+
+	for (op=OP_MIN; op<=OP_MAX; op++) {
+		printf("Scanning op=%d\n", op);
+		for (level = 0; level <= 50; level++) {
+			scan_trans2(&cli, op, level, fnum, dnum, fname);
+		}
+
+		for (level = 0x100; level <= 0x130; level++) {
+			scan_trans2(&cli, op, level, fnum, dnum, fname);
+		}
+
+		for (level = 1000; level < 1050; level++) {
+			scan_trans2(&cli, op, level, fnum, dnum, fname);
+		}
+	}
+
+	torture_close_connection(&cli);
+
+	printf("trans2 scan finished\n");
+	return True;
+}
+
+
+
+
+/****************************************************************************
+look for a partial hit
+****************************************************************************/
+static void nttrans_check_hit(char *format, int op, int level, uint32 status)
+{
+	switch (status) {
+	case NT_STATUS_INVALID_LEVEL:
+	case NT_STATUS_NOT_IMPLEMENTED:
+	case NT_STATUS_NOT_SUPPORTED:
+	case NT_STATUS_UNSUCCESSFUL:
+	case NT_STATUS_INVALID_INFO_CLASS:
+		break;
+	default:
+#if VERBOSE
+		printf("possible %s hit op=%3d level=%5d status=%s\n",
+		       format, op, level, get_nt_error_msg(status));
+#endif
+	}
+}
+
+/****************************************************************************
+check for existance of a nttrans call
+****************************************************************************/
+static uint32 try_nttrans(struct cli_state *cli, 
+			 int op,
+			 char *param, char *data,
+			 int param_len, int data_len,
+			 int *rparam_len, int *rdata_len)
+{
+	char *rparam=NULL, *rdata=NULL;
+
+	if (!cli_send_nt_trans(cli, op, 
+			       0,   
+			       NULL, 0, 0,
+			       param, param_len, 2,            /* param, length, max */
+			       data, data_len, cli->max_xmit   /* data, length, max */
+                           )) {
+		return cli_nt_error(cli);
+	}
+
+	cli_receive_nt_trans(cli,
+			     &rparam, rparam_len,
+			     &rdata, rdata_len);
+
+	if (rdata) free(rdata);
+	if (rparam) free(rparam);
+
+	return cli_nt_error(cli);
+}
+
+
+static uint32 try_nttrans_len(struct cli_state *cli, 
+			     char *format,
+			     int op, int level,
+			     char *param, char *data,
+			     int param_len, int *data_len,
+			     int *rparam_len, int *rdata_len)
+{
+	uint32 ret=0;
+
+	ret = try_nttrans(cli, op, param, data, param_len,
+			 sizeof(pstring), rparam_len, rdata_len);
+#if VERBOSE 
+	printf("op=%d level=%d ret=%s\n", op, level, get_nt_error_msg(ret));
+#endif
+	if (ret != 0) return ret;
+
+	*data_len = 0;
+	while (*data_len < sizeof(pstring)) {
+		ret = try_nttrans(cli, op, param, data, param_len,
+				 *data_len, rparam_len, rdata_len);
+		if (ret == 0) break;
+		*data_len += 2;
+	}
+	if (ret == NT_STATUS_NOPROBLEMO) {
+		printf("found %s level=%d data_len=%d rparam_len=%d rdata_len=%d\n",
+		       format, level, *data_len, *rparam_len, *rdata_len);
+	} else {
+		nttrans_check_hit(format, op, level, ret);
+	}
+	return ret;
+}
+
+/****************************************************************************
+check for existance of a nttrans call
+****************************************************************************/
+static BOOL scan_nttrans(struct cli_state *cli, int op, int level, 
+			int fnum, int dnum, char *fname)
+{
+	int data_len = 0;
+	int param_len = 0;
+	int rparam_len, rdata_len;
+	pstring param, data;
+	uint32 status;
+
+	memset(data, 0, sizeof(data));
+	data_len = 4;
+
+	/* try with a info level only */
+	param_len = 2;
+	SSVAL(param, 0, level);
+	status = try_nttrans_len(cli, "void", op, level, param, data, param_len, &data_len, 
+			    &rparam_len, &rdata_len);
+	if (status == 0) return True;
+
+	/* try with a file descriptor */
+	param_len = 6;
+	SSVAL(param, 0, fnum);
+	SSVAL(param, 2, level);
+	SSVAL(param, 4, 0);
+	status = try_nttrans_len(cli, "fnum", op, level, param, data, param_len, &data_len, 
+				&rparam_len, &rdata_len);
+	if (status == 0) return True;
+
+
+	/* try with a notify style */
+	param_len = 6;
+	SSVAL(param, 0, dnum);
+	SSVAL(param, 2, dnum);
+	SSVAL(param, 4, level);
+	status = try_nttrans_len(cli, "notify", op, level, param, data, param_len, &data_len, 
+				&rparam_len, &rdata_len);
+	if (status == 0) return True;
+
+	/* try with a file name */
+	param_len = 6;
+	SSVAL(param, 0, level);
+	SSVAL(param, 2, 0);
+	SSVAL(param, 4, 0);
+	param_len += clistr_push(cli, &param[6], fname, -1, STR_TERMINATE);
+
+	status = try_nttrans_len(cli, "fname", op, level, param, data, param_len, &data_len, 
+				&rparam_len, &rdata_len);
+	if (status == 0) return True;
+
+	/* try with a new file name */
+	param_len = 6;
+	SSVAL(param, 0, level);
+	SSVAL(param, 2, 0);
+	SSVAL(param, 4, 0);
+	param_len += clistr_push(cli, &param[6], "\\newfile.dat", -1, STR_TERMINATE);
+
+	status = try_nttrans_len(cli, "newfile", op, level, param, data, param_len, &data_len, 
+				&rparam_len, &rdata_len);
+	cli_unlink(cli, "\\newfile.dat");
+	cli_rmdir(cli, "\\newfile.dat");
+	if (status == 0) return True;
+
+	/* try dfs style  */
+	cli_mkdir(cli, "\\testdir");
+	param_len = 2;
+	SSVAL(param, 0, level);
+	param_len += clistr_push(cli, &param[2], "\\testdir", -1, STR_TERMINATE);
+
+	status = try_nttrans_len(cli, "dfs", op, level, param, data, param_len, &data_len, 
+				&rparam_len, &rdata_len);
+	cli_rmdir(cli, "\\testdir");
+	if (status == 0) return True;
+
+	return False;
+}
+
+
+BOOL torture_nttrans_scan(int dummy)
+{
+	static struct cli_state cli;
+	int op, level;
+	char *fname = "\\scanner.dat";
+	int fnum, dnum;
+
+	printf("starting nttrans scan test\n");
+
+	if (!torture_open_connection(&cli)) {
+		return False;
+	}
+
+	fnum = cli_open(&cli, fname, O_RDWR | O_CREAT | O_TRUNC, 
+			 DENY_NONE);
+	dnum = cli_open(&cli, "\\", O_RDONLY, DENY_NONE);
+
+	for (op=OP_MIN; op<=OP_MAX; op++) {
+		printf("Scanning op=%d\n", op);
+		for (level = 0; level <= 50; level++) {
+			scan_nttrans(&cli, op, level, fnum, dnum, fname);
+		}
+
+		for (level = 0x100; level <= 0x130; level++) {
+			scan_nttrans(&cli, op, level, fnum, dnum, fname);
+		}
+
+		for (level = 1000; level < 1050; level++) {
+			scan_nttrans(&cli, op, level, fnum, dnum, fname);
+		}
+	}
+
+	torture_close_connection(&cli);
+
+	printf("nttrans scan finished\n");
+	return True;
+}
-- 
cgit 


From b031af348c7dcc8c74bf49945211c466b8eca079 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Mon, 27 Aug 2001 19:46:22 +0000
Subject: converted another bunch of stuff to NTSTATUS (This used to be commit
 1d36250e338ae0ff9fbbf86019809205dd97d05e)

---
 source3/torture/scanner.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'source3/torture/scanner.c')

diff --git a/source3/torture/scanner.c b/source3/torture/scanner.c
index 5c1c59ca8c..19505d257d 100644
--- a/source3/torture/scanner.c
+++ b/source3/torture/scanner.c
@@ -30,7 +30,7 @@
 /****************************************************************************
 look for a partial hit
 ****************************************************************************/
-static void trans2_check_hit(char *format, int op, int level, uint32 status)
+static void trans2_check_hit(char *format, int op, int level, NTSTATUS status)
 {
 	switch (status) {
 	case NT_STATUS_INVALID_LEVEL:
@@ -103,7 +103,7 @@ static uint32 try_trans2_len(struct cli_state *cli,
 		if (ret == 0) break;
 		*data_len += 2;
 	}
-	if (ret == NT_STATUS_NOPROBLEMO) {
+	if (ret == NT_STATUS_OK) {
 		printf("found %s level=%d data_len=%d rparam_len=%d rdata_len=%d\n",
 		       format, level, *data_len, *rparam_len, *rdata_len);
 	} else {
@@ -122,7 +122,7 @@ static BOOL scan_trans2(struct cli_state *cli, int op, int level,
 	int param_len = 0;
 	int rparam_len, rdata_len;
 	pstring param, data;
-	uint32 status;
+	NTSTATUS status;
 
 	memset(data, 0, sizeof(data));
 	data_len = 4;
@@ -236,7 +236,7 @@ BOOL torture_trans2_scan(int dummy)
 /****************************************************************************
 look for a partial hit
 ****************************************************************************/
-static void nttrans_check_hit(char *format, int op, int level, uint32 status)
+static void nttrans_check_hit(char *format, int op, int level, NTSTATUS status)
 {
 	switch (status) {
 	case NT_STATUS_INVALID_LEVEL:
@@ -307,7 +307,7 @@ static uint32 try_nttrans_len(struct cli_state *cli,
 		if (ret == 0) break;
 		*data_len += 2;
 	}
-	if (ret == NT_STATUS_NOPROBLEMO) {
+	if (ret == NT_STATUS_OK) {
 		printf("found %s level=%d data_len=%d rparam_len=%d rdata_len=%d\n",
 		       format, level, *data_len, *rparam_len, *rdata_len);
 	} else {
@@ -326,7 +326,7 @@ static BOOL scan_nttrans(struct cli_state *cli, int op, int level,
 	int param_len = 0;
 	int rparam_len, rdata_len;
 	pstring param, data;
-	uint32 status;
+	NTSTATUS status;
 
 	memset(data, 0, sizeof(data));
 	data_len = 4;
-- 
cgit 


From cefa698c725c883c418b915b057e4ef023610a1d Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 4 Sep 2001 11:52:42 +0000
Subject: fixed compilation of torture (This used to be commit
 aaf538a83057150cc35e9032aff7a78e8f0c4dc2)

---
 source3/torture/scanner.c | 84 ++++++++++++++++++++++-------------------------
 1 file changed, 40 insertions(+), 44 deletions(-)

(limited to 'source3/torture/scanner.c')

diff --git a/source3/torture/scanner.c b/source3/torture/scanner.c
index 19505d257d..c5f6708408 100644
--- a/source3/torture/scanner.c
+++ b/source3/torture/scanner.c
@@ -32,25 +32,23 @@ look for a partial hit
 ****************************************************************************/
 static void trans2_check_hit(char *format, int op, int level, NTSTATUS status)
 {
-	switch (status) {
-	case NT_STATUS_INVALID_LEVEL:
-	case NT_STATUS_NOT_IMPLEMENTED:
-	case NT_STATUS_NOT_SUPPORTED:
-	case NT_STATUS_UNSUCCESSFUL:
-	case NT_STATUS_INVALID_INFO_CLASS:
-		break;
-	default:
+	if (NT_STATUS_V(status) == NT_STATUS_V(NT_STATUS_INVALID_LEVEL) ||
+	    NT_STATUS_V(status) == NT_STATUS_V(NT_STATUS_NOT_IMPLEMENTED) ||
+	    NT_STATUS_V(status) == NT_STATUS_V(NT_STATUS_NOT_SUPPORTED) ||
+	    NT_STATUS_V(status) == NT_STATUS_V(NT_STATUS_UNSUCCESSFUL) ||
+	    NT_STATUS_V(status) == NT_STATUS_V(NT_STATUS_INVALID_INFO_CLASS)) {
+		return;
+	}
 #if VERBOSE
-		printf("possible %s hit op=%3d level=%5d status=%s\n",
-		       format, op, level, get_nt_error_msg(status));
+	printf("possible %s hit op=%3d level=%5d status=%s\n",
+	       format, op, level, get_nt_error_msg(status));
 #endif
-	}
 }
 
 /****************************************************************************
 check for existance of a trans2 call
 ****************************************************************************/
-static uint32 try_trans2(struct cli_state *cli, 
+static NTSTATUS try_trans2(struct cli_state *cli, 
 			 int op,
 			 char *param, char *data,
 			 int param_len, int data_len,
@@ -80,30 +78,30 @@ static uint32 try_trans2(struct cli_state *cli,
 }
 
 
-static uint32 try_trans2_len(struct cli_state *cli, 
+static NTSTATUS try_trans2_len(struct cli_state *cli, 
 			     char *format,
 			     int op, int level,
 			     char *param, char *data,
 			     int param_len, int *data_len,
 			     int *rparam_len, int *rdata_len)
 {
-	uint32 ret=0;
+	NTSTATUS ret=NT_STATUS_OK;
 
 	ret = try_trans2(cli, op, param, data, param_len,
 			 sizeof(pstring), rparam_len, rdata_len);
 #if VERBOSE 
 	printf("op=%d level=%d ret=%s\n", op, level, get_nt_error_msg(ret));
 #endif
-	if (ret != 0) return ret;
+	if (!NT_STATUS_IS_OK(ret)) return ret;
 
 	*data_len = 0;
 	while (*data_len < sizeof(pstring)) {
 		ret = try_trans2(cli, op, param, data, param_len,
 				 *data_len, rparam_len, rdata_len);
-		if (ret == 0) break;
+		if (NT_STATUS_IS_OK(ret)) break;
 		*data_len += 2;
 	}
-	if (ret == NT_STATUS_OK) {
+	if (NT_STATUS_IS_OK(ret)) {
 		printf("found %s level=%d data_len=%d rparam_len=%d rdata_len=%d\n",
 		       format, level, *data_len, *rparam_len, *rdata_len);
 	} else {
@@ -132,7 +130,7 @@ static BOOL scan_trans2(struct cli_state *cli, int op, int level,
 	SSVAL(param, 0, level);
 	status = try_trans2_len(cli, "void", op, level, param, data, param_len, &data_len, 
 			    &rparam_len, &rdata_len);
-	if (status == 0) return True;
+	if (NT_STATUS_IS_OK(status)) return True;
 
 	/* try with a file descriptor */
 	param_len = 6;
@@ -141,7 +139,7 @@ static BOOL scan_trans2(struct cli_state *cli, int op, int level,
 	SSVAL(param, 4, 0);
 	status = try_trans2_len(cli, "fnum", op, level, param, data, param_len, &data_len, 
 				&rparam_len, &rdata_len);
-	if (status == 0) return True;
+	if (NT_STATUS_IS_OK(status)) return True;
 
 
 	/* try with a notify style */
@@ -151,7 +149,7 @@ static BOOL scan_trans2(struct cli_state *cli, int op, int level,
 	SSVAL(param, 4, level);
 	status = try_trans2_len(cli, "notify", op, level, param, data, param_len, &data_len, 
 				&rparam_len, &rdata_len);
-	if (status == 0) return True;
+	if (NT_STATUS_IS_OK(status)) return True;
 
 	/* try with a file name */
 	param_len = 6;
@@ -162,7 +160,7 @@ static BOOL scan_trans2(struct cli_state *cli, int op, int level,
 
 	status = try_trans2_len(cli, "fname", op, level, param, data, param_len, &data_len, 
 				&rparam_len, &rdata_len);
-	if (status == 0) return True;
+	if (NT_STATUS_IS_OK(status)) return True;
 
 	/* try with a new file name */
 	param_len = 6;
@@ -175,7 +173,7 @@ static BOOL scan_trans2(struct cli_state *cli, int op, int level,
 				&rparam_len, &rdata_len);
 	cli_unlink(cli, "\\newfile.dat");
 	cli_rmdir(cli, "\\newfile.dat");
-	if (status == 0) return True;
+	if (NT_STATUS_IS_OK(status)) return True;
 
 	/* try dfs style  */
 	cli_mkdir(cli, "\\testdir");
@@ -186,7 +184,7 @@ static BOOL scan_trans2(struct cli_state *cli, int op, int level,
 	status = try_trans2_len(cli, "dfs", op, level, param, data, param_len, &data_len, 
 				&rparam_len, &rdata_len);
 	cli_rmdir(cli, "\\testdir");
-	if (status == 0) return True;
+	if (NT_STATUS_IS_OK(status)) return True;
 
 	return False;
 }
@@ -238,25 +236,23 @@ look for a partial hit
 ****************************************************************************/
 static void nttrans_check_hit(char *format, int op, int level, NTSTATUS status)
 {
-	switch (status) {
-	case NT_STATUS_INVALID_LEVEL:
-	case NT_STATUS_NOT_IMPLEMENTED:
-	case NT_STATUS_NOT_SUPPORTED:
-	case NT_STATUS_UNSUCCESSFUL:
-	case NT_STATUS_INVALID_INFO_CLASS:
-		break;
-	default:
+	if (NT_STATUS_V(status) == NT_STATUS_V(NT_STATUS_INVALID_LEVEL) ||
+	    NT_STATUS_V(status) == NT_STATUS_V(NT_STATUS_NOT_IMPLEMENTED) ||
+	    NT_STATUS_V(status) == NT_STATUS_V(NT_STATUS_NOT_SUPPORTED) ||
+	    NT_STATUS_V(status) == NT_STATUS_V(NT_STATUS_UNSUCCESSFUL) ||
+	    NT_STATUS_V(status) == NT_STATUS_V(NT_STATUS_INVALID_INFO_CLASS)) {
+		return;
+	}
 #if VERBOSE
 		printf("possible %s hit op=%3d level=%5d status=%s\n",
 		       format, op, level, get_nt_error_msg(status));
 #endif
-	}
 }
 
 /****************************************************************************
 check for existance of a nttrans call
 ****************************************************************************/
-static uint32 try_nttrans(struct cli_state *cli, 
+static NTSTATUS try_nttrans(struct cli_state *cli, 
 			 int op,
 			 char *param, char *data,
 			 int param_len, int data_len,
@@ -284,30 +280,30 @@ static uint32 try_nttrans(struct cli_state *cli,
 }
 
 
-static uint32 try_nttrans_len(struct cli_state *cli, 
+static NTSTATUS try_nttrans_len(struct cli_state *cli, 
 			     char *format,
 			     int op, int level,
 			     char *param, char *data,
 			     int param_len, int *data_len,
 			     int *rparam_len, int *rdata_len)
 {
-	uint32 ret=0;
+	NTSTATUS ret=NT_STATUS_OK;
 
 	ret = try_nttrans(cli, op, param, data, param_len,
 			 sizeof(pstring), rparam_len, rdata_len);
 #if VERBOSE 
 	printf("op=%d level=%d ret=%s\n", op, level, get_nt_error_msg(ret));
 #endif
-	if (ret != 0) return ret;
+	if (!NT_STATUS_IS_OK(ret)) return ret;
 
 	*data_len = 0;
 	while (*data_len < sizeof(pstring)) {
 		ret = try_nttrans(cli, op, param, data, param_len,
 				 *data_len, rparam_len, rdata_len);
-		if (ret == 0) break;
+		if (NT_STATUS_IS_OK(ret)) break;
 		*data_len += 2;
 	}
-	if (ret == NT_STATUS_OK) {
+	if (NT_STATUS_IS_OK(ret)) {
 		printf("found %s level=%d data_len=%d rparam_len=%d rdata_len=%d\n",
 		       format, level, *data_len, *rparam_len, *rdata_len);
 	} else {
@@ -336,7 +332,7 @@ static BOOL scan_nttrans(struct cli_state *cli, int op, int level,
 	SSVAL(param, 0, level);
 	status = try_nttrans_len(cli, "void", op, level, param, data, param_len, &data_len, 
 			    &rparam_len, &rdata_len);
-	if (status == 0) return True;
+	if (NT_STATUS_IS_OK(status)) return True;
 
 	/* try with a file descriptor */
 	param_len = 6;
@@ -345,7 +341,7 @@ static BOOL scan_nttrans(struct cli_state *cli, int op, int level,
 	SSVAL(param, 4, 0);
 	status = try_nttrans_len(cli, "fnum", op, level, param, data, param_len, &data_len, 
 				&rparam_len, &rdata_len);
-	if (status == 0) return True;
+	if (NT_STATUS_IS_OK(status)) return True;
 
 
 	/* try with a notify style */
@@ -355,7 +351,7 @@ static BOOL scan_nttrans(struct cli_state *cli, int op, int level,
 	SSVAL(param, 4, level);
 	status = try_nttrans_len(cli, "notify", op, level, param, data, param_len, &data_len, 
 				&rparam_len, &rdata_len);
-	if (status == 0) return True;
+	if (NT_STATUS_IS_OK(status)) return True;
 
 	/* try with a file name */
 	param_len = 6;
@@ -366,7 +362,7 @@ static BOOL scan_nttrans(struct cli_state *cli, int op, int level,
 
 	status = try_nttrans_len(cli, "fname", op, level, param, data, param_len, &data_len, 
 				&rparam_len, &rdata_len);
-	if (status == 0) return True;
+	if (NT_STATUS_IS_OK(status)) return True;
 
 	/* try with a new file name */
 	param_len = 6;
@@ -379,7 +375,7 @@ static BOOL scan_nttrans(struct cli_state *cli, int op, int level,
 				&rparam_len, &rdata_len);
 	cli_unlink(cli, "\\newfile.dat");
 	cli_rmdir(cli, "\\newfile.dat");
-	if (status == 0) return True;
+	if (NT_STATUS_IS_OK(status)) return True;
 
 	/* try dfs style  */
 	cli_mkdir(cli, "\\testdir");
@@ -390,7 +386,7 @@ static BOOL scan_nttrans(struct cli_state *cli, int op, int level,
 	status = try_nttrans_len(cli, "dfs", op, level, param, data, param_len, &data_len, 
 				&rparam_len, &rdata_len);
 	cli_rmdir(cli, "\\testdir");
-	if (status == 0) return True;
+	if (NT_STATUS_IS_OK(status)) return True;
 
 	return False;
 }
-- 
cgit 


From 2d6a3079b805a57f5618c97fff2adda77de934f4 Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Mon, 17 Sep 2001 11:37:57 +0000
Subject: move to SAFE_FREE() (This used to be commit
 fc71962409e11509a60fb2be6741c32970865881)

---
 source3/torture/scanner.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source3/torture/scanner.c')

diff --git a/source3/torture/scanner.c b/source3/torture/scanner.c
index c5f6708408..a6025593ff 100644
--- a/source3/torture/scanner.c
+++ b/source3/torture/scanner.c
@@ -71,8 +71,8 @@ static NTSTATUS try_trans2(struct cli_state *cli,
 			   &rparam, rparam_len,
 			   &rdata, rdata_len);
 
-	if (rdata) free(rdata);
-	if (rparam) free(rparam);
+	SAFE_FREE(rdata);
+	SAFE_FREE(rparam);
 
 	return cli_nt_error(cli);
 }
@@ -273,8 +273,8 @@ static NTSTATUS try_nttrans(struct cli_state *cli,
 			     &rparam, rparam_len,
 			     &rdata, rdata_len);
 
-	if (rdata) free(rdata);
-	if (rparam) free(rparam);
+	SAFE_FREE(rdata);
+	SAFE_FREE(rparam);
 
 	return cli_nt_error(cli);
 }
-- 
cgit 


From cd68afe31256ad60748b34f7318a180cfc2127cc Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Wed, 30 Jan 2002 06:08:46 +0000
Subject: Removed version number from file header.

Changed "SMB/Netbios" to "SMB/CIFS" in file header.
(This used to be commit 6a58c9bd06d0d7502a24bf5ce5a2faf0a146edfa)
---
 source3/torture/scanner.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'source3/torture/scanner.c')

diff --git a/source3/torture/scanner.c b/source3/torture/scanner.c
index a6025593ff..69c2bfe72f 100644
--- a/source3/torture/scanner.c
+++ b/source3/torture/scanner.c
@@ -1,6 +1,5 @@
 /* 
-   Unix SMB/Netbios implementation.
-   Version 3.0
+   Unix SMB/CIFS implementation.
    SMB torture tester - scanning functions
    Copyright (C) Andrew Tridgell 2001
    
-- 
cgit 


From ab13654dc9ac23872e4d1384e1c54e336f113009 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Sun, 17 Mar 2002 04:36:35 +0000
Subject: Renamed get_nt_error_msg() to nt_errstr(). (This used to be commit
 1f007d3ed41c1b71a89fa6be7d173e67e927c302)

---
 source3/torture/scanner.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source3/torture/scanner.c')

diff --git a/source3/torture/scanner.c b/source3/torture/scanner.c
index 69c2bfe72f..4f4164ea33 100644
--- a/source3/torture/scanner.c
+++ b/source3/torture/scanner.c
@@ -40,7 +40,7 @@ static void trans2_check_hit(char *format, int op, int level, NTSTATUS status)
 	}
 #if VERBOSE
 	printf("possible %s hit op=%3d level=%5d status=%s\n",
-	       format, op, level, get_nt_error_msg(status));
+	       format, op, level, nt_errstr(status));
 #endif
 }
 
@@ -89,7 +89,7 @@ static NTSTATUS try_trans2_len(struct cli_state *cli,
 	ret = try_trans2(cli, op, param, data, param_len,
 			 sizeof(pstring), rparam_len, rdata_len);
 #if VERBOSE 
-	printf("op=%d level=%d ret=%s\n", op, level, get_nt_error_msg(ret));
+	printf("op=%d level=%d ret=%s\n", op, level, nt_errstr(ret));
 #endif
 	if (!NT_STATUS_IS_OK(ret)) return ret;
 
@@ -244,7 +244,7 @@ static void nttrans_check_hit(char *format, int op, int level, NTSTATUS status)
 	}
 #if VERBOSE
 		printf("possible %s hit op=%3d level=%5d status=%s\n",
-		       format, op, level, get_nt_error_msg(status));
+		       format, op, level, nt_errstr(status));
 #endif
 }
 
@@ -291,7 +291,7 @@ static NTSTATUS try_nttrans_len(struct cli_state *cli,
 	ret = try_nttrans(cli, op, param, data, param_len,
 			 sizeof(pstring), rparam_len, rdata_len);
 #if VERBOSE 
-	printf("op=%d level=%d ret=%s\n", op, level, get_nt_error_msg(ret));
+	printf("op=%d level=%d ret=%s\n", op, level, nt_errstr(ret));
 #endif
 	if (!NT_STATUS_IS_OK(ret)) return ret;
 
-- 
cgit 


From 634c54310c92c48dd4eceec602e230a021bdcfc5 Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Fri, 3 Jan 2003 08:28:12 +0000
Subject: Merge from HEAD - make Samba compile with -Wwrite-strings without
 additional warnings.  (Adds a lot of const).

Andrew Bartlett
(This used to be commit 3a7458f9472432ef12c43008414925fd1ce8ea0c)
---
 source3/torture/scanner.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'source3/torture/scanner.c')

diff --git a/source3/torture/scanner.c b/source3/torture/scanner.c
index 4f4164ea33..7db3dde9c0 100644
--- a/source3/torture/scanner.c
+++ b/source3/torture/scanner.c
@@ -29,7 +29,7 @@
 /****************************************************************************
 look for a partial hit
 ****************************************************************************/
-static void trans2_check_hit(char *format, int op, int level, NTSTATUS status)
+static void trans2_check_hit(const char *format, int op, int level, NTSTATUS status)
 {
 	if (NT_STATUS_V(status) == NT_STATUS_V(NT_STATUS_INVALID_LEVEL) ||
 	    NT_STATUS_V(status) == NT_STATUS_V(NT_STATUS_NOT_IMPLEMENTED) ||
@@ -78,7 +78,7 @@ static NTSTATUS try_trans2(struct cli_state *cli,
 
 
 static NTSTATUS try_trans2_len(struct cli_state *cli, 
-			     char *format,
+			     const char *format,
 			     int op, int level,
 			     char *param, char *data,
 			     int param_len, int *data_len,
@@ -113,7 +113,7 @@ static NTSTATUS try_trans2_len(struct cli_state *cli,
 check for existance of a trans2 call
 ****************************************************************************/
 static BOOL scan_trans2(struct cli_state *cli, int op, int level, 
-			int fnum, int dnum, char *fname)
+			int fnum, int dnum, const char *fname)
 {
 	int data_len = 0;
 	int param_len = 0;
@@ -193,7 +193,7 @@ BOOL torture_trans2_scan(int dummy)
 {
 	static struct cli_state cli;
 	int op, level;
-	char *fname = "\\scanner.dat";
+	const char *fname = "\\scanner.dat";
 	int fnum, dnum;
 
 	printf("starting trans2 scan test\n");
@@ -233,7 +233,7 @@ BOOL torture_trans2_scan(int dummy)
 /****************************************************************************
 look for a partial hit
 ****************************************************************************/
-static void nttrans_check_hit(char *format, int op, int level, NTSTATUS status)
+static void nttrans_check_hit(const char *format, int op, int level, NTSTATUS status)
 {
 	if (NT_STATUS_V(status) == NT_STATUS_V(NT_STATUS_INVALID_LEVEL) ||
 	    NT_STATUS_V(status) == NT_STATUS_V(NT_STATUS_NOT_IMPLEMENTED) ||
@@ -280,7 +280,7 @@ static NTSTATUS try_nttrans(struct cli_state *cli,
 
 
 static NTSTATUS try_nttrans_len(struct cli_state *cli, 
-			     char *format,
+			     const char *format,
 			     int op, int level,
 			     char *param, char *data,
 			     int param_len, int *data_len,
@@ -315,7 +315,7 @@ static NTSTATUS try_nttrans_len(struct cli_state *cli,
 check for existance of a nttrans call
 ****************************************************************************/
 static BOOL scan_nttrans(struct cli_state *cli, int op, int level, 
-			int fnum, int dnum, char *fname)
+			int fnum, int dnum, const char *fname)
 {
 	int data_len = 0;
 	int param_len = 0;
@@ -395,7 +395,7 @@ BOOL torture_nttrans_scan(int dummy)
 {
 	static struct cli_state cli;
 	int op, level;
-	char *fname = "\\scanner.dat";
+	const char *fname = "\\scanner.dat";
 	int fnum, dnum;
 
 	printf("starting nttrans scan test\n");
-- 
cgit 


From 2206df6b30c4992daa17257287390421cfc0662d Mon Sep 17 00:00:00 2001
From: Andrew Bartlett <abartlet@samba.org>
Date: Wed, 23 Apr 2003 08:12:34 +0000
Subject: Merge torture tests from HEAD - it looks like we had rather an
 incomplete merge last time.  I hope this might fix a few failures on the
 build farm too.

Andrew Bartlett
(This used to be commit 0c837126923cc30fa60223a5a68d4f527971cc7b)
---
 source3/torture/scanner.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

(limited to 'source3/torture/scanner.c')

diff --git a/source3/torture/scanner.c b/source3/torture/scanner.c
index 7db3dde9c0..93f89c105c 100644
--- a/source3/torture/scanner.c
+++ b/source3/torture/scanner.c
@@ -191,7 +191,7 @@ static BOOL scan_trans2(struct cli_state *cli, int op, int level,
 
 BOOL torture_trans2_scan(int dummy)
 {
-	static struct cli_state cli;
+	static struct cli_state *cli;
 	int op, level;
 	const char *fname = "\\scanner.dat";
 	int fnum, dnum;
@@ -202,26 +202,26 @@ BOOL torture_trans2_scan(int dummy)
 		return False;
 	}
 
-	fnum = cli_open(&cli, fname, O_RDWR | O_CREAT | O_TRUNC, 
+	fnum = cli_open(cli, fname, O_RDWR | O_CREAT | O_TRUNC, 
 			 DENY_NONE);
-	dnum = cli_open(&cli, "\\", O_RDONLY, DENY_NONE);
+	dnum = cli_open(cli, "\\", O_RDONLY, DENY_NONE);
 
 	for (op=OP_MIN; op<=OP_MAX; op++) {
 		printf("Scanning op=%d\n", op);
 		for (level = 0; level <= 50; level++) {
-			scan_trans2(&cli, op, level, fnum, dnum, fname);
+			scan_trans2(cli, op, level, fnum, dnum, fname);
 		}
 
 		for (level = 0x100; level <= 0x130; level++) {
-			scan_trans2(&cli, op, level, fnum, dnum, fname);
+			scan_trans2(cli, op, level, fnum, dnum, fname);
 		}
 
 		for (level = 1000; level < 1050; level++) {
-			scan_trans2(&cli, op, level, fnum, dnum, fname);
+			scan_trans2(cli, op, level, fnum, dnum, fname);
 		}
 	}
 
-	torture_close_connection(&cli);
+	torture_close_connection(cli);
 
 	printf("trans2 scan finished\n");
 	return True;
@@ -393,7 +393,7 @@ static BOOL scan_nttrans(struct cli_state *cli, int op, int level,
 
 BOOL torture_nttrans_scan(int dummy)
 {
-	static struct cli_state cli;
+	static struct cli_state *cli;
 	int op, level;
 	const char *fname = "\\scanner.dat";
 	int fnum, dnum;
@@ -404,26 +404,26 @@ BOOL torture_nttrans_scan(int dummy)
 		return False;
 	}
 
-	fnum = cli_open(&cli, fname, O_RDWR | O_CREAT | O_TRUNC, 
+	fnum = cli_open(cli, fname, O_RDWR | O_CREAT | O_TRUNC, 
 			 DENY_NONE);
-	dnum = cli_open(&cli, "\\", O_RDONLY, DENY_NONE);
+	dnum = cli_open(cli, "\\", O_RDONLY, DENY_NONE);
 
 	for (op=OP_MIN; op<=OP_MAX; op++) {
 		printf("Scanning op=%d\n", op);
 		for (level = 0; level <= 50; level++) {
-			scan_nttrans(&cli, op, level, fnum, dnum, fname);
+			scan_nttrans(cli, op, level, fnum, dnum, fname);
 		}
 
 		for (level = 0x100; level <= 0x130; level++) {
-			scan_nttrans(&cli, op, level, fnum, dnum, fname);
+			scan_nttrans(cli, op, level, fnum, dnum, fname);
 		}
 
 		for (level = 1000; level < 1050; level++) {
-			scan_nttrans(&cli, op, level, fnum, dnum, fname);
+			scan_nttrans(cli, op, level, fnum, dnum, fname);
 		}
 	}
 
-	torture_close_connection(&cli);
+	torture_close_connection(cli);
 
 	printf("nttrans scan finished\n");
 	return True;
-- 
cgit 


From ab398643a4e44211696ef5ce72b62ab7ecee7bc9 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Tue, 19 Jul 2005 02:37:04 +0000
Subject: r8572: Remove crufty #define NO_SYSLOG as it's not used at all
 anymore. (This used to be commit 985dbb47d925e79c1195ca219f7ab5d6648b22b8)

---
 source3/torture/scanner.c | 2 --
 1 file changed, 2 deletions(-)

(limited to 'source3/torture/scanner.c')

diff --git a/source3/torture/scanner.c b/source3/torture/scanner.c
index 93f89c105c..1893be8369 100644
--- a/source3/torture/scanner.c
+++ b/source3/torture/scanner.c
@@ -18,8 +18,6 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#define NO_SYSLOG
-
 #include "includes.h"
 
 #define VERBOSE 0
-- 
cgit 


From fbdcf2663b56007a438ac4f0d8d82436b1bfe688 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Tue, 11 Jul 2006 18:01:26 +0000
Subject: r16945: Sync trunk -> 3.0 for 3.0.24 code. Still need to do the upper
 layer directories but this is what everyone is waiting for....

Jeremy.
(This used to be commit 9dafb7f48ca3e7af956b0a7d1720c2546fc4cfb8)
---
 source3/torture/scanner.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'source3/torture/scanner.c')

diff --git a/source3/torture/scanner.c b/source3/torture/scanner.c
index 1893be8369..1510cd70f4 100644
--- a/source3/torture/scanner.c
+++ b/source3/torture/scanner.c
@@ -49,7 +49,7 @@ static NTSTATUS try_trans2(struct cli_state *cli,
 			 int op,
 			 char *param, char *data,
 			 int param_len, int data_len,
-			 int *rparam_len, int *rdata_len)
+			 unsigned int *rparam_len, unsigned int *rdata_len)
 {
 	uint16 setup = op;
 	char *rparam=NULL, *rdata=NULL;
@@ -80,7 +80,7 @@ static NTSTATUS try_trans2_len(struct cli_state *cli,
 			     int op, int level,
 			     char *param, char *data,
 			     int param_len, int *data_len,
-			     int *rparam_len, int *rdata_len)
+			     unsigned int *rparam_len, unsigned int *rdata_len)
 {
 	NTSTATUS ret=NT_STATUS_OK;
 
@@ -115,7 +115,7 @@ static BOOL scan_trans2(struct cli_state *cli, int op, int level,
 {
 	int data_len = 0;
 	int param_len = 0;
-	int rparam_len, rdata_len;
+	unsigned int rparam_len, rdata_len;
 	pstring param, data;
 	NTSTATUS status;
 
@@ -253,7 +253,7 @@ static NTSTATUS try_nttrans(struct cli_state *cli,
 			 int op,
 			 char *param, char *data,
 			 int param_len, int data_len,
-			 int *rparam_len, int *rdata_len)
+			 unsigned int *rparam_len, unsigned int *rdata_len)
 {
 	char *rparam=NULL, *rdata=NULL;
 
@@ -282,7 +282,7 @@ static NTSTATUS try_nttrans_len(struct cli_state *cli,
 			     int op, int level,
 			     char *param, char *data,
 			     int param_len, int *data_len,
-			     int *rparam_len, int *rdata_len)
+			     unsigned int *rparam_len, unsigned int *rdata_len)
 {
 	NTSTATUS ret=NT_STATUS_OK;
 
@@ -317,7 +317,7 @@ static BOOL scan_nttrans(struct cli_state *cli, int op, int level,
 {
 	int data_len = 0;
 	int param_len = 0;
-	int rparam_len, rdata_len;
+	unsigned int rparam_len, rdata_len;
 	pstring param, data;
 	NTSTATUS status;
 
-- 
cgit 


From 5fbe298b5ad781670715c63e248131498d73e7c6 Mon Sep 17 00:00:00 2001
From: Alexander Bokovoy <ab@samba.org>
Date: Mon, 31 Jul 2006 09:41:25 +0000
Subject: r17338: Add support for multiple shares test inspired by Samba 4
 torture's --unclist option. Triggered by -b sharelist_file option. Based on
 Peter Samogyi's work. I'm not sure what concept for fstring replacement is
 currently in place though (talloc-ed strings? or it was for pstring only?)
 (This used to be commit c9f8fafad698c5bc75df86ee8b611104d3fb65bc)

---
 source3/torture/scanner.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'source3/torture/scanner.c')

diff --git a/source3/torture/scanner.c b/source3/torture/scanner.c
index 1510cd70f4..87c82f8a73 100644
--- a/source3/torture/scanner.c
+++ b/source3/torture/scanner.c
@@ -196,7 +196,7 @@ BOOL torture_trans2_scan(int dummy)
 
 	printf("starting trans2 scan test\n");
 
-	if (!torture_open_connection(&cli)) {
+	if (!torture_open_connection(&cli, 0)) {
 		return False;
 	}
 
@@ -398,7 +398,7 @@ BOOL torture_nttrans_scan(int dummy)
 
 	printf("starting nttrans scan test\n");
 
-	if (!torture_open_connection(&cli)) {
+	if (!torture_open_connection(&cli, 0)) {
 		return False;
 	}
 
-- 
cgit 


From d824b98f80ba186030cbb70b3a1e5daf80469ecd Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Mon, 9 Jul 2007 19:25:36 +0000
Subject: r23779: Change from v2 or later to v3 or later. Jeremy. (This used to
 be commit 407e6e695b8366369b7c76af1ff76869b45347b3)

---
 source3/torture/scanner.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/torture/scanner.c')

diff --git a/source3/torture/scanner.c b/source3/torture/scanner.c
index 87c82f8a73..61dfe070ea 100644
--- a/source3/torture/scanner.c
+++ b/source3/torture/scanner.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,
-- 
cgit 


From 5e54558c6dea67b56bbfaba5698f3a434d3dffb6 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 10 Jul 2007 00:52:41 +0000
Subject: r23784: use the GPLv3 boilerplate as recommended by the FSF and the
 license text (This used to be commit
 b0132e94fc5fef936aa766fb99a306b3628e9f07)

---
 source3/torture/scanner.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'source3/torture/scanner.c')

diff --git a/source3/torture/scanner.c b/source3/torture/scanner.c
index 61dfe070ea..19f021bd10 100644
--- a/source3/torture/scanner.c
+++ b/source3/torture/scanner.c
@@ -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 30191d1a5704ad2b158386b511558972d539ce47 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Thu, 18 Oct 2007 17:40:25 -0700
Subject: RIP BOOL. Convert BOOL -> bool. I found a few interesting bugs in
 various places whilst doing this (places that assumed BOOL == int). I also
 need to fix the Samba4 pidl generation (next checkin). Jeremy. (This used to
 be commit f35a266b3cbb3e5fa6a86be60f34fe340a3ca71f)

---
 source3/torture/scanner.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'source3/torture/scanner.c')

diff --git a/source3/torture/scanner.c b/source3/torture/scanner.c
index 19f021bd10..4f52a5812c 100644
--- a/source3/torture/scanner.c
+++ b/source3/torture/scanner.c
@@ -109,7 +109,7 @@ static NTSTATUS try_trans2_len(struct cli_state *cli,
 /****************************************************************************
 check for existance of a trans2 call
 ****************************************************************************/
-static BOOL scan_trans2(struct cli_state *cli, int op, int level, 
+static bool scan_trans2(struct cli_state *cli, int op, int level, 
 			int fnum, int dnum, const char *fname)
 {
 	int data_len = 0;
@@ -186,7 +186,7 @@ static BOOL scan_trans2(struct cli_state *cli, int op, int level,
 }
 
 
-BOOL torture_trans2_scan(int dummy)
+bool torture_trans2_scan(int dummy)
 {
 	static struct cli_state *cli;
 	int op, level;
@@ -311,7 +311,7 @@ static NTSTATUS try_nttrans_len(struct cli_state *cli,
 /****************************************************************************
 check for existance of a nttrans call
 ****************************************************************************/
-static BOOL scan_nttrans(struct cli_state *cli, int op, int level, 
+static bool scan_nttrans(struct cli_state *cli, int op, int level, 
 			int fnum, int dnum, const char *fname)
 {
 	int data_len = 0;
@@ -388,7 +388,7 @@ static BOOL scan_nttrans(struct cli_state *cli, int op, int level,
 }
 
 
-BOOL torture_nttrans_scan(int dummy)
+bool torture_nttrans_scan(int dummy)
 {
 	static struct cli_state *cli;
 	int op, level;
-- 
cgit 


From 755051b569762c13f8f4b4e52fa1183108a4e466 Mon Sep 17 00:00:00 2001
From: Jeremy Allison <jra@samba.org>
Date: Tue, 4 Dec 2007 17:05:33 -0800
Subject: pull_ascii_pstring is gone. Jeremy. (This used to be commit
 288aacce4b56d159218be311019cb951e5a232fd)

---
 source3/torture/scanner.c | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

(limited to 'source3/torture/scanner.c')

diff --git a/source3/torture/scanner.c b/source3/torture/scanner.c
index 4f52a5812c..21b32dcf23 100644
--- a/source3/torture/scanner.c
+++ b/source3/torture/scanner.c
@@ -23,6 +23,9 @@
 #define OP_MIN 0
 #define OP_MAX 20
 
+#define DATA_SIZE 1024
+#define PARAM_SIZE 1024
+
 /****************************************************************************
 look for a partial hit
 ****************************************************************************/
@@ -84,14 +87,14 @@ static NTSTATUS try_trans2_len(struct cli_state *cli,
 	NTSTATUS ret=NT_STATUS_OK;
 
 	ret = try_trans2(cli, op, param, data, param_len,
-			 sizeof(pstring), rparam_len, rdata_len);
+			 DATA_SIZE, rparam_len, rdata_len);
 #if VERBOSE 
 	printf("op=%d level=%d ret=%s\n", op, level, nt_errstr(ret));
 #endif
 	if (!NT_STATUS_IS_OK(ret)) return ret;
 
 	*data_len = 0;
-	while (*data_len < sizeof(pstring)) {
+	while (*data_len < DATA_SIZE) {
 		ret = try_trans2(cli, op, param, data, param_len,
 				 *data_len, rparam_len, rdata_len);
 		if (NT_STATUS_IS_OK(ret)) break;
@@ -115,7 +118,7 @@ static bool scan_trans2(struct cli_state *cli, int op, int level,
 	int data_len = 0;
 	int param_len = 0;
 	unsigned int rparam_len, rdata_len;
-	pstring param, data;
+	char param[PARAM_SIZE], data[DATA_SIZE];
 	NTSTATUS status;
 
 	memset(data, 0, sizeof(data));
@@ -286,14 +289,14 @@ static NTSTATUS try_nttrans_len(struct cli_state *cli,
 	NTSTATUS ret=NT_STATUS_OK;
 
 	ret = try_nttrans(cli, op, param, data, param_len,
-			 sizeof(pstring), rparam_len, rdata_len);
+			 DATA_SIZE, rparam_len, rdata_len);
 #if VERBOSE 
 	printf("op=%d level=%d ret=%s\n", op, level, nt_errstr(ret));
 #endif
 	if (!NT_STATUS_IS_OK(ret)) return ret;
 
 	*data_len = 0;
-	while (*data_len < sizeof(pstring)) {
+	while (*data_len < DATA_SIZE) {
 		ret = try_nttrans(cli, op, param, data, param_len,
 				 *data_len, rparam_len, rdata_len);
 		if (NT_STATUS_IS_OK(ret)) break;
@@ -317,7 +320,7 @@ static bool scan_nttrans(struct cli_state *cli, int op, int level,
 	int data_len = 0;
 	int param_len = 0;
 	unsigned int rparam_len, rdata_len;
-	pstring param, data;
+	char param[PARAM_SIZE], data[DATA_SIZE];
 	NTSTATUS status;
 
 	memset(data, 0, sizeof(data));
-- 
cgit