svn commit: samba r3254 - in branches/SAMBA_4_0/source: ntvfs/posix script/tests torture/raw

[tridge at samba.org]

Author: tridge
Date: 2004-10-26 08:41:12 +0000 (Tue, 26 Oct 2004)
New Revision: 3254

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source&rev=3254&nolog=1

Log:
- expanded the RAW-IOCTL test

- fixed the old ioctl interface to not check handle before failing

- pvs now passes RAW-IOCTL

Modified:
   branches/SAMBA_4_0/source/ntvfs/posix/pvfs_ioctl.c
   branches/SAMBA_4_0/source/script/tests/test_posix.sh
   branches/SAMBA_4_0/source/torture/raw/ioctl.c


Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/posix/pvfs_ioctl.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/posix/pvfs_ioctl.c	2004-10-26 08:35:29 UTC (rev 3253)
+++ branches/SAMBA_4_0/source/ntvfs/posix/pvfs_ioctl.c	2004-10-26 08:41:12 UTC (rev 3254)
@@ -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;
 }
 
 /*

Modified: branches/SAMBA_4_0/source/script/tests/test_posix.sh
===================================================================
--- branches/SAMBA_4_0/source/script/tests/test_posix.sh	2004-10-26 08:35:29 UTC (rev 3253)
+++ branches/SAMBA_4_0/source/script/tests/test_posix.sh	2004-10-26 08:41:12 UTC (rev 3254)
@@ -37,11 +37,11 @@
 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"
 

Modified: branches/SAMBA_4_0/source/torture/raw/ioctl.c
===================================================================
--- branches/SAMBA_4_0/source/torture/raw/ioctl.c	2004-10-26 08:35:29 UTC (rev 3253)
+++ branches/SAMBA_4_0/source/torture/raw/ioctl.c	2004-10-26 08:41:12 UTC (rev 3254)
@@ -50,6 +50,14 @@
 		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;