From a703329908431b473483fe0e70a121fff1e5fbf6 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 4 Jul 2005 05:24:39 +0000 Subject: r8122: more fixes from testing dos error code handling against w2k3 (This used to be commit b71fbcf5e2c627d918aef555b8cc8dd4591d8fe7) --- source4/torture/raw/close.c | 2 +- source4/torture/raw/ioctl.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'source4/torture') 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); -- cgit