summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2011-07-07 15:38:02 +0200
committerStefan Metzmacher <metze@samba.org>2011-07-07 19:16:28 +0200
commitfc992e7029a8cec00b91b50e79f90dea09efcab2 (patch)
tree8e50f7a7c590fd5e2946bb2623fb3bd76612d049
parent02171ee0f06c2558adee82e929e8926123e0a13c (diff)
downloadsamba-fc992e7029a8cec00b91b50e79f90dea09efcab2.tar.gz
samba-fc992e7029a8cec00b91b50e79f90dea09efcab2.tar.bz2
samba-fc992e7029a8cec00b91b50e79f90dea09efcab2.zip
s3:torture/scanner: use trans2_bytes_push_str() in scan_nttrans()
metze
-rw-r--r--source3/torture/scanner.c66
1 files changed, 52 insertions, 14 deletions
diff --git a/source3/torture/scanner.c b/source3/torture/scanner.c
index 10e695c919..5edd52d567 100644
--- a/source3/torture/scanner.c
+++ b/source3/torture/scanner.c
@@ -366,71 +366,109 @@ static bool scan_nttrans(struct cli_state *cli, int op, int level,
uint32_t data_len = 0;
uint32_t param_len = 0;
uint32_t rparam_len, rdata_len;
- uint8_t param[PARAM_SIZE], data[DATA_SIZE];
+ uint8_t *param = NULL;
+ uint8_t data[DATA_SIZE];
NTSTATUS status;
+ const char *newfname;
+ const char *dname;
memset(data, 0, sizeof(data));
data_len = 4;
/* try with a info level only */
- param_len = 2;
+ TALLOC_FREE(param);
+ param = talloc_array(talloc_tos(), uint8_t, 2);
+ if (param == NULL) return True;
+
SSVAL(param, 0, level);
+
+ param_len = talloc_get_size(param);
status = try_nttrans_len(cli, "void", op, level, param, data, param_len, &data_len,
&rparam_len, &rdata_len);
if (NT_STATUS_IS_OK(status)) return True;
/* try with a file descriptor */
- param_len = 6;
+ TALLOC_FREE(param);
+ param = talloc_array(talloc_tos(), uint8_t, 6);
+ if (param == NULL) return True;
+
SSVAL(param, 0, fnum);
SSVAL(param, 2, level);
SSVAL(param, 4, 0);
+
+ param_len = talloc_get_size(param);
status = try_nttrans_len(cli, "fnum", op, level, param, data, param_len, &data_len,
&rparam_len, &rdata_len);
if (NT_STATUS_IS_OK(status)) return True;
/* try with a notify style */
- param_len = 6;
+ TALLOC_FREE(param);
+ param = talloc_array(talloc_tos(), uint8_t, 6);
+ if (param == NULL) return True;
+
SSVAL(param, 0, dnum);
SSVAL(param, 2, dnum);
SSVAL(param, 4, level);
+
+ param_len = talloc_get_size(param);
status = try_nttrans_len(cli, "notify", op, level, param, data, param_len, &data_len,
&rparam_len, &rdata_len);
if (NT_STATUS_IS_OK(status)) return True;
/* try with a file name */
- param_len = 6;
+ TALLOC_FREE(param);
+ param = talloc_array(talloc_tos(), uint8_t, 6);
+ if (param == NULL) return True;
+
SSVAL(param, 0, level);
SSVAL(param, 2, 0);
SSVAL(param, 4, 0);
- param_len += clistr_push(cli, &param[6], fname, -1, STR_TERMINATE);
+ param = trans2_bytes_push_str(param, cli_ucs2(cli),
+ fname, strlen(fname)+1, NULL);
+ if (param == NULL) return True;
+ param_len = talloc_get_size(param);
status = try_nttrans_len(cli, "fname", op, level, param, data, param_len, &data_len,
&rparam_len, &rdata_len);
if (NT_STATUS_IS_OK(status)) return True;
/* try with a new file name */
- param_len = 6;
+ newfname = "\\newfile.dat";
+ TALLOC_FREE(param);
+ param = talloc_array(talloc_tos(), uint8_t, 6);
+ if (param == NULL) return True;
+
SSVAL(param, 0, level);
SSVAL(param, 2, 0);
SSVAL(param, 4, 0);
- param_len += clistr_push(cli, &param[6], "\\newfile.dat", -1, STR_TERMINATE);
+ param = trans2_bytes_push_str(param, cli_ucs2(cli),
+ newfname, strlen(newfname)+1, NULL);
+ if (param == NULL) return True;
+ param_len = talloc_get_size(param);
status = try_nttrans_len(cli, "newfile", op, level, param, data, param_len, &data_len,
&rparam_len, &rdata_len);
- cli_unlink(cli, "\\newfile.dat", FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
- cli_rmdir(cli, "\\newfile.dat");
+ cli_unlink(cli, newfname, FILE_ATTRIBUTE_SYSTEM | FILE_ATTRIBUTE_HIDDEN);
+ cli_rmdir(cli, newfname);
if (NT_STATUS_IS_OK(status)) return True;
/* try dfs style */
- cli_mkdir(cli, "\\testdir");
- param_len = 2;
+ dname = "\\testdir";
+ cli_mkdir(cli, dname);
+ TALLOC_FREE(param);
+ param = talloc_array(talloc_tos(), uint8_t, 2);
+ if (param == NULL) return True;
+
SSVAL(param, 0, level);
- param_len += clistr_push(cli, &param[2], "\\testdir", -1, STR_TERMINATE);
+ param = trans2_bytes_push_str(param, cli_ucs2(cli),
+ dname, strlen(dname)+1, NULL);
+ if (param == NULL) return True;
+ param_len = talloc_get_size(param);
status = try_nttrans_len(cli, "dfs", op, level, param, data, param_len, &data_len,
&rparam_len, &rdata_len);
- cli_rmdir(cli, "\\testdir");
+ cli_rmdir(cli, dname);
if (NT_STATUS_IS_OK(status)) return True;
return False;