summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-07-04 05:24:39 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:19:11 -0500
commita703329908431b473483fe0e70a121fff1e5fbf6 (patch)
tree2f8cfddca20bb1c78ab2c0ab1aaf2d50e33669a6
parent8ade96e5e4385767dfd733db966f85ef16d77501 (diff)
downloadsamba-a703329908431b473483fe0e70a121fff1e5fbf6.tar.gz
samba-a703329908431b473483fe0e70a121fff1e5fbf6.tar.bz2
samba-a703329908431b473483fe0e70a121fff1e5fbf6.zip
r8122: more fixes from testing dos error code handling against w2k3
(This used to be commit b71fbcf5e2c627d918aef555b8cc8dd4591d8fe7)
-rw-r--r--source4/ntvfs/posix/pvfs_ioctl.c2
-rw-r--r--source4/ntvfs/posix/pvfs_open.c2
-rw-r--r--source4/torture/raw/close.c2
-rw-r--r--source4/torture/raw/ioctl.c6
4 files changed, 6 insertions, 6 deletions
diff --git a/source4/ntvfs/posix/pvfs_ioctl.c b/source4/ntvfs/posix/pvfs_ioctl.c
index 45d29b530d..abf575aa3d 100644
--- 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 f58cc60f9a..327f096e7c 100644
--- 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 5f2b7040d9..733800da19 100644
--- 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 70a0b2b528..b8bf3b2701 100644
--- 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);