diff options
| author | Andrew Tridgell <tridge@samba.org> | 2004-10-26 08:41:12 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 13:04:46 -0500 |
| commit | 4db039c3f33ff4119ced156f23786b1bcb73b5fd (patch) | |
| tree | bc8390dc0002271230df337bf6ddd590ca39c8b6 | |
| parent | 7f60959e64c4281e02fd11fbcce2d15f43da1892 (diff) | |
| download | samba-4db039c3f33ff4119ced156f23786b1bcb73b5fd.tar.gz samba-4db039c3f33ff4119ced156f23786b1bcb73b5fd.tar.bz2 samba-4db039c3f33ff4119ced156f23786b1bcb73b5fd.zip | |
r3254: - expanded the RAW-IOCTL test
- fixed the old ioctl interface to not check handle before failing
- pvs now passes RAW-IOCTL
(This used to be commit 98f6dbdba46c907039951559ec5f526410fd0039)
| -rw-r--r-- | source4/ntvfs/posix/pvfs_ioctl.c | 10 | ||||
| -rwxr-xr-x | source4/script/tests/test_posix.sh | 4 | ||||
| -rw-r--r-- | source4/torture/raw/ioctl.c | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/source4/ntvfs/posix/pvfs_ioctl.c b/source4/ntvfs/posix/pvfs_ioctl.c index 15b9d6c27a..4feca8979f 100644 --- a/source4/ntvfs/posix/pvfs_ioctl.c +++ b/source4/ntvfs/posix/pvfs_ioctl.c @@ -29,15 +29,7 @@ static NTSTATUS pvfs_ioctl_old(struct ntvfs_module_context *ntvfs, struct smbsrv_request *req, union smb_ioctl *io) { - struct pvfs_state *pvfs = ntvfs->private_data; - struct pvfs_file *f; - - f = pvfs_find_fd(pvfs, req, io->ioctl.in.fnum); - if (!f) { - return NT_STATUS_INVALID_HANDLE; - } - - return NT_STATUS_NOT_SUPPORTED; + return NT_STATUS_UNSUCCESSFUL; } /* diff --git a/source4/script/tests/test_posix.sh b/source4/script/tests/test_posix.sh index aefdfd19f0..9ea4a6df6e 100755 --- a/source4/script/tests/test_posix.sh +++ b/source4/script/tests/test_posix.sh @@ -37,11 +37,11 @@ tests="$tests BASE-DELETE BASE-PROPERTIES BASE-MANGLE" tests="$tests BASE-CHKPATH BASE-SECLEAK BASE-TRANS2" tests="$tests RAW-QFSINFO RAW-QFILEINFO RAW-SFILEINFO-BUG" tests="$tests RAW-LOCK RAW-MKDIR RAW-SEEK RAW-CONTEXT BASE-RENAME" -tests="$tests RAW-UNLINK RAW-READ RAW-CLOSE" +tests="$tests RAW-UNLINK RAW-READ RAW-CLOSE RAW-IOCTL" tests="$tests LOCAL-ICONV LOCAL-TALLOC LOCAL-MESSAGING LOCAL-BINDING LOCAL-IDTREE" soon="BASE-DENY1 BASE-DEFER_OPEN BASE-OPENATTR BASE-CHARSET" -soon="$soon RAW-SFILEINFO RAW-SEARCH RAW-OPEN RAW-OPLOCK RAW-NOTIFY RAW-MUX RAW-IOCTL" +soon="$soon RAW-SFILEINFO RAW-SEARCH RAW-OPEN RAW-OPLOCK RAW-NOTIFY RAW-MUX" soon="$soon RAW-CHKPATH RAW-WRITE RAW-RENAME" soon="$soon BASE-TRANS2" diff --git a/source4/torture/raw/ioctl.c b/source4/torture/raw/ioctl.c index f7ce954c94..d433eaa637 100644 --- a/source4/torture/raw/ioctl.c +++ b/source4/torture/raw/ioctl.c @@ -50,6 +50,14 @@ static BOOL test_ioctl(struct smbcli_state *cli, TALLOC_CTX *mem_ctx) goto done; } + printf("Trying 0xFFFF\n"); + ctl.ioctl.level = RAW_IOCTL_IOCTL; + ctl.ioctl.in.fnum = fnum; + ctl.ioctl.in.request = 0xFFFF; + + status = smb_raw_ioctl(cli->tree, mem_ctx, &ctl); + CHECK_STATUS(status, NT_STATUS_UNSUCCESSFUL); + printf("Trying QUERY_JOB_INFO\n"); ctl.ioctl.level = RAW_IOCTL_IOCTL; ctl.ioctl.in.fnum = fnum; |