sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-04 17:47:26 +03:00
Code

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

Browse Source
This commit is contained in:
Andrew Tridgell 2005-07-04 05:24:39 +00:00 committed by Gerald (Jerry) Carter
parent aefa9e53fa
commit b71fbcf5e2
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/ntvfs/posix/pvfs_ioctl.c
View File

@ -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);
}
/*

2
source/ntvfs/posix/pvfs_open.c
View File

@ -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) {

2
source/torture/raw/close.c
View File

@ -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);

6
source/torture/raw/ioctl.c
View File

@ -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);