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

r3530: make sure we match ntvfs_async_state_pop() with ntvfs_async_state_push()

Browse Source 
(This used to be commit 730ae0600e6c75a7048f7aaf3995604e8cdbba39)
This commit is contained in:
Andrew Tridgell 2004-11-04 12:12:09 +00:00 committed by Gerald (Jerry) Carter
parent f71a4941f0
commit 8fa7f264c6
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
source4/ntvfs/ntvfs_generic.c
View File

@ -247,7 +247,8 @@ NTSTATUS ntvfs_map_open(struct smbsrv_request *req, union smb_open *io,
io->openx.out.access = OPENX_MODE_ACCESS_RDWR;
break;
default:
return NT_STATUS_INVALID_LOCK_SEQUENCE;
status = NT_STATUS_INVALID_LOCK_SEQUENCE;
goto done;
}
switch (io->openx.in.open_mode & OPENX_MODE_DENY_MASK) {
@ -280,7 +281,8 @@ NTSTATUS ntvfs_map_open(struct smbsrv_request *req, union smb_open *io,
io2->generic.in.share_access = NTCREATEX_SHARE_ACCESS_NONE;
break;
default:
return NT_STATUS_INVALID_LOCK_SEQUENCE;
status = NT_STATUS_INVALID_LOCK_SEQUENCE;
goto done;
}
switch (io->openx.in.open_func) {
@ -306,7 +308,8 @@ NTSTATUS ntvfs_map_open(struct smbsrv_request *req, union smb_open *io,
io2->generic.in.open_disposition = NTCREATEX_DISP_CREATE;
break;
}
return NT_STATUS_INVALID_LOCK_SEQUENCE;
status = NT_STATUS_INVALID_LOCK_SEQUENCE;
goto done;
}
io2->generic.in.alloc_size = 0;
@ -339,7 +342,8 @@ NTSTATUS ntvfs_map_open(struct smbsrv_request *req, union smb_open *io,
default:
DEBUG(2,("ntvfs_map_open(OPEN): invalid mode 0x%x\n",
io->openold.in.flags & OPEN_FLAGS_MODE_MASK));
return NT_STATUS_INVALID_PARAMETER;
status = NT_STATUS_INVALID_PARAMETER;
goto done;
}
switch (io->openold.in.flags & OPEN_FLAGS_DENY_MASK) {
@ -375,16 +379,19 @@ NTSTATUS ntvfs_map_open(struct smbsrv_request *req, union smb_open *io,
default:
DEBUG(2,("ntvfs_map_open(OPEN): invalid DENY 0x%x\n",
io->openold.in.flags & OPEN_FLAGS_DENY_MASK));
return NT_STATUS_INVALID_PARAMETER;
status = NT_STATUS_INVALID_PARAMETER;
goto done;
}
status = ntvfs->ops->openfile(ntvfs, req, io2);
break;
default:
return NT_STATUS_INVALID_LEVEL;
status = NT_STATUS_INVALID_LEVEL;
break;
}
done:
return ntvfs_map_async_finish(req, status);
}
@ -1080,7 +1087,8 @@ NTSTATUS ntvfs_map_read(struct smbsrv_request *req, union smb_read *rd,
lck = talloc_p(rd2, union smb_lock);
if (lck == NULL) {
return NT_STATUS_NO_MEMORY;
status = NT_STATUS_NO_MEMORY;
goto done;
}
lck->lock.level = RAW_LOCK_LOCK;
lck->lock.in.fnum = rd->lockread.in.fnum;
@ -1102,6 +1110,7 @@ NTSTATUS ntvfs_map_read(struct smbsrv_request *req, union smb_read *rd,
break;
}
done:
return ntvfs_map_async_finish(req, status);
}