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

(This used to be commit b71fbcf5e2c627d918aef555b8cc8dd4591d8fe7)

diff --git a/source4/ntvfs/posix/pvfs_ioctl.c b/source4/ntvfs/posix/pvfs_ioctl.c
index 45d29b530d012e900e1c211751385cd950d91661..abf575aa3df7cc181a392f9bffcbf4c2ce2e0a64 100644 (file)
--- a/source4/ntvfs/posix/pvfs_ioctl.c
+++ b/source4/ntvfs/posix/pvfs_ioctl.c
@@ -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);
 }
 
 /*

diff --git a/source4/ntvfs/posix/pvfs_open.c b/source4/ntvfs/posix/pvfs_open.c
index f58cc60f9ace6f847bc384fcedc13154cceba9bc..327f096e7ca66c79d72c58cfc6a0ff7e4a0d77f8 100644 (file)
--- a/source4/ntvfs/posix/pvfs_open.c
+++ b/source4/ntvfs/posix/pvfs_open.c
@@ -1156,7 +1156,7 @@ NTSTATUS pvfs_close(struct ntvfs_module_context *ntvfs,
        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) {

diff --git a/source4/torture/raw/close.c b/source4/torture/raw/close.c
index 5f2b7040d997a1bd6c2cd312df8e81484874e8c6..733800da193117115529b3b28bd9a20e4616b2ec 100644 (file)
--- a/source4/torture/raw/close.c
+++ b/source4/torture/raw/close.c
@@ -135,7 +135,7 @@ BOOL torture_raw_close(void)
        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);

diff --git a/source4/torture/raw/ioctl.c b/source4/torture/raw/ioctl.c
index 70a0b2b528a89a85a03d49954e11eb9a89054943..b8bf3b2701257bcb83106cf5c3b4f7b27c39e18d 100644 (file)
--- a/source4/torture/raw/ioctl.c
+++ b/source4/torture/raw/ioctl.c
@@ -57,7 +57,7 @@ static BOOL test_ioctl(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
        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 @@ static BOOL test_ioctl(struct smbcli_state *cli, TALLOC_CTX *mem_ctx)
        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);