svn commit: samba r8122 - in branches/SAMBA_4_0/source: ntvfs/posix torture/raw

tridge at samba.org tridge at samba.org
Mon Jul 4 05:24:40 GMT 2005


Author: tridge
Date: 2005-07-04 05:24:39 +0000 (Mon, 04 Jul 2005)
New Revision: 8122

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=8122

Log:
more fixes from testing dos error code handling against w2k3

Modified:
   branches/SAMBA_4_0/source/ntvfs/posix/pvfs_ioctl.c
   branches/SAMBA_4_0/source/ntvfs/posix/pvfs_open.c
   branches/SAMBA_4_0/source/torture/raw/close.c
   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	2005-07-04 05:16:57 UTC (rev 8121)
+++ branches/SAMBA_4_0/source/ntvfs/posix/pvfs_ioctl.c	2005-07-04 05:24:39 UTC (rev 8122)
@@ -30,7 +30,7 @@
 static NTSTATUS pvfs_ioctl_old(struct ntvfs_module_context *ntvfs,
 			struct smbsrv_request *req, union smb_ioctl *io)
 {
-	return NT_STATUS_UNSUCCESSFUL;
+	return NT_STATUS_DOS(ERRSRV, ERRerror);
 }
 
 /*

Modified: branches/SAMBA_4_0/source/ntvfs/posix/pvfs_open.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/posix/pvfs_open.c	2005-07-04 05:16:57 UTC (rev 8121)
+++ branches/SAMBA_4_0/source/ntvfs/posix/pvfs_open.c	2005-07-04 05:24:39 UTC (rev 8122)
@@ -1156,7 +1156,7 @@
 	struct utimbuf unix_times;
 
 	if (io->generic.level == RAW_CLOSE_SPLCLOSE) {
-		return NT_STATUS_UNSUCCESSFUL;
+		return NT_STATUS_DOS(ERRSRV, ERRerror);
 	}
 
 	if (io->generic.level != RAW_CLOSE_CLOSE) {

Modified: branches/SAMBA_4_0/source/torture/raw/close.c
===================================================================
--- branches/SAMBA_4_0/source/torture/raw/close.c	2005-07-04 05:16:57 UTC (rev 8121)
+++ branches/SAMBA_4_0/source/torture/raw/close.c	2005-07-04 05:24:39 UTC (rev 8122)
@@ -135,7 +135,7 @@
 	io.splclose.level = RAW_CLOSE_SPLCLOSE;
 	io.splclose.in.fnum = fnum;
 	status = smb_raw_close(cli->tree, &io);
-	CHECK_STATUS(status, NT_STATUS_UNSUCCESSFUL);
+	CHECK_STATUS(status, NT_STATUS_DOS(ERRSRV, ERRerror));
 
 	printf("testing flush\n");
 	smbcli_close(cli->tree, fnum);

Modified: branches/SAMBA_4_0/source/torture/raw/ioctl.c
===================================================================
--- branches/SAMBA_4_0/source/torture/raw/ioctl.c	2005-07-04 05:16:57 UTC (rev 8121)
+++ branches/SAMBA_4_0/source/torture/raw/ioctl.c	2005-07-04 05:24:39 UTC (rev 8122)
@@ -57,7 +57,7 @@
 	ctl.ioctl.in.request = 0xFFFF;
 
 	status = smb_raw_ioctl(cli->tree, mem_ctx, &ctl);
-	CHECK_STATUS(status, NT_STATUS_UNSUCCESSFUL);
+	CHECK_STATUS(status, NT_STATUS_DOS(ERRSRV, ERRerror));
 
  	printf("Trying QUERY_JOB_INFO\n");
  	ctl.ioctl.level = RAW_IOCTL_IOCTL;
@@ -65,12 +65,12 @@
 	ctl.ioctl.in.request = IOCTL_QUERY_JOB_INFO;
 
 	status = smb_raw_ioctl(cli->tree, mem_ctx, &ctl);
-	CHECK_STATUS(status, NT_STATUS_UNSUCCESSFUL);
+	CHECK_STATUS(status, NT_STATUS_DOS(ERRSRV, ERRerror));
 
  	printf("Trying bad handle\n");
 	ctl.ioctl.in.fnum = fnum+1;
 	status = smb_raw_ioctl(cli->tree, mem_ctx, &ctl);
-	CHECK_STATUS(status, NT_STATUS_UNSUCCESSFUL);
+	CHECK_STATUS(status, NT_STATUS_DOS(ERRSRV, ERRerror));
 
 done:
 	smbcli_close(cli->tree, fnum);



More information about the samba-cvs mailing list