diff options
| author | Jeremy Allison <jra@samba.org> | 1998-08-19 01:49:34 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1998-08-19 01:49:34 +0000 |
| commit | 12de4034c72ea5054d716bf848c2b16bef7a4d89 (patch) | |
| tree | 55a877cb872f4c2584905f02ba2f42d3bbddb9b1 /source3/smbd/nttrans.c | |
| parent | 1e6837837ac402702ccadcbcfd853b8c673c783a (diff) | |
| download | samba-12de4034c72ea5054d716bf848c2b16bef7a4d89.tar.gz samba-12de4034c72ea5054d716bf848c2b16bef7a4d89.tar.bz2 samba-12de4034c72ea5054d716bf848c2b16bef7a4d89.zip | |
Makefile.in: Moved blocking lock code into smbd/blocking.c for link purposes.
include/includes.h: Added nterr.h.
locking/locking.c: Moved blocking lock code into smbd/blocking.c for link purposes.
smbd/close.c: Added blocking lock removal to file close.
smbd/filename.c: Tidied up unix_convert() so I could read it (:-) in preparation
for the stat_cache code.
smbd/nttrans.c: Added WRITE_ATTRIBUTES check.
smbd/reply.c: Fixed multibyte char problem in wildcard mask.
Jeremy.
(This used to be commit 148eaba3dadb1d0bd3ac3ef53da3d9811636e89a)
Diffstat (limited to 'source3/smbd/nttrans.c')
| -rw-r--r-- | source3/smbd/nttrans.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c index b5ed42fbb3..9a9fc51d36 100644 --- a/source3/smbd/nttrans.c +++ b/source3/smbd/nttrans.c @@ -321,7 +321,7 @@ static int map_share_mode( uint32 desired_access, uint32 share_access, uint32 fi } if (smb_open_mode == -1) { - if(desired_access & DELETE_ACCESS) + if(desired_access & (DELETE_ACCESS|FILE_WRITE_ATTRIBUTES)) smb_open_mode = 2; else if( desired_access & FILE_EXECUTE) smb_open_mode = 0; @@ -909,12 +909,11 @@ int reply_ntcancel(connection_struct *conn, { /* * Go through and cancel any pending change notifies. - * TODO: When we add blocking locks we will add cancel - * for them here too. */ int mid = SVAL(inbuf,smb_mid); remove_pending_change_notify_requests_by_mid(mid); + remove_pending_lock_requests_by_mid(mid); DEBUG(3,("reply_ntcancel: cancel called on mid = %d.\n", mid)); |