diff options
| author | Jeremy Allison <jra@samba.org> | 2004-10-18 22:01:10 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 10:52:59 -0500 |
| commit | 8c1c918c94b443c7154d535b1f99201dc1767f97 (patch) | |
| tree | 035450f9826cca05d8082fb01e3058f3d8b0ae76 /source3/smbd/reply.c | |
| parent | c53e6401eb3de7fa4abc85c25f8672b624cf2c66 (diff) | |
| download | samba-8c1c918c94b443c7154d535b1f99201dc1767f97.tar.gz samba-8c1c918c94b443c7154d535b1f99201dc1767f97.tar.bz2 samba-8c1c918c94b443c7154d535b1f99201dc1767f97.zip | |
r3050: Steal from Samba4 :-). Make us pass most of the new lock tests (except for
the cancel lock which I have to add).
Jeremy.
(This used to be commit cf7f89999e0c6becd4617c812400d1e71b9c0a30)
Diffstat (limited to 'source3/smbd/reply.c')
| -rw-r--r-- | source3/smbd/reply.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index cdf607e273..845f058867 100644 --- a/source3/smbd/reply.c +++ b/source3/smbd/reply.c @@ -4514,13 +4514,18 @@ int reply_lockingX(connection_struct *conn, char *inbuf,char *outbuf,int length, data = smb_buf(inbuf); - if (locktype & (LOCKING_ANDX_CANCEL_LOCK | LOCKING_ANDX_CHANGE_LOCKTYPE)) { + if (locktype & LOCKING_ANDX_CHANGE_LOCKTYPE) { /* we don't support these - and CANCEL_LOCK makes w2k and XP reboot so I don't really want to be compatible! (tridge) */ return ERROR_NT(NT_STATUS_NOT_SUPPORTED); } + if (locktype & LOCKING_ANDX_CANCEL_LOCK) { + /* Need to make this like a cancel.... JRA. */ + return ERROR_NT(NT_STATUS_UNSUCCESSFUL); + } + /* Check if this is an oplock break on a file we have granted an oplock on. */ |