diff options
author | Andrew Tridgell <tridge@samba.org> | 2003-12-04 02:03:06 +0000 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2003-12-04 02:03:06 +0000 |
commit | 926240428c0646aabb13539745940b61a7cf44a9 (patch) | |
tree | 102988d47fab4a56b59161409dddc9c9dfa86ed5 /source4/torture/torture.c | |
parent | b8cbd9181efabbc360ef335e214a696011839b41 (diff) | |
download | samba-926240428c0646aabb13539745940b61a7cf44a9.tar.gz samba-926240428c0646aabb13539745940b61a7cf44a9.tar.bz2 samba-926240428c0646aabb13539745940b61a7cf44a9.zip |
* patch based on work by Jim Myers to unify the ioctl handling to be
more like the other major SMB functions
* added SMBntrename code
(This used to be commit f2d3dc9893fa0e089c407fa16ce9ff13587e70cd)
Diffstat (limited to 'source4/torture/torture.c')
-rw-r--r-- | source4/torture/torture.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/source4/torture/torture.c b/source4/torture/torture.c index 3851337b8e..cc0a83fe80 100644 --- a/source4/torture/torture.c +++ b/source4/torture/torture.c @@ -3589,9 +3589,8 @@ BOOL torture_ioctl_test(int dummy) uint16 device, function; int fnum; const char *fname = "\\ioctl.dat"; - DATA_BLOB blob; NTSTATUS status; - struct smb_ioctl parms; + union smb_ioctl parms; TALLOC_CTX *mem_ctx; if (!torture_open_connection(&cli)) { @@ -3610,20 +3609,20 @@ BOOL torture_ioctl_test(int dummy) return False; } - parms.in.request = IOCTL_QUERY_JOB_INFO; + parms.ioctl.level = RAW_IOCTL_IOCTL; + parms.ioctl.in.request = IOCTL_QUERY_JOB_INFO; status = smb_raw_ioctl(cli->tree, mem_ctx, &parms); printf("ioctl job info: %s\n", cli_errstr(cli)); for (device=0;device<0x100;device++) { printf("testing device=0x%x\n", device); for (function=0;function<0x100;function++) { - parms.in.request = (device << 16) | function; + parms.ioctl.in.request = (device << 16) | function; status = smb_raw_ioctl(cli->tree, mem_ctx, &parms); if (NT_STATUS_IS_OK(status)) { printf("ioctl device=0x%x function=0x%x OK : %d bytes\n", - device, function, blob.length); - data_blob_free(&parms.out.blob); + device, function, parms.ioctl.out.blob.length); } } } |