diff options
| author | Jeremy Allison <jra@samba.org> | 1998-10-23 00:58:28 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1998-10-23 00:58:28 +0000 |
| commit | 5d6ed11ef3c860c95ae7b3a855b0ddb123bd9737 (patch) | |
| tree | 13a6cba2591bcb12dfc838055d5cb80971574778 /source3/smbd/close.c | |
| parent | 95056761c8137aa0d0d4f04e862efa7fa94e064c (diff) | |
| download | samba-5d6ed11ef3c860c95ae7b3a855b0ddb123bd9737.tar.gz samba-5d6ed11ef3c860c95ae7b3a855b0ddb123bd9737.tar.bz2 samba-5d6ed11ef3c860c95ae7b3a855b0ddb123bd9737.zip | |
include/smb.h: Added #defines for lots of things - makes our code a *lot* easier to read.
lib/util.c: Fixed Luke's set_first_token() function - should return void.
smbd/close.c: Move delete_on_close into file_fd_struct structure.
smbd/ipc.c: Changed local_machine back to fstring.
smbd/nttrans.c: Use defines for mapping share modes.
smbd/open.c: Move delete_on_close into file_fd_struct structure, added code for ALLOW_SHARE_DELETE.
smbd/reply.c: Use defines for mapping share modes.
smbd/trans2.c: Move delete_on_close into file_fd_struct structure.
Jeremy.
(This used to be commit 8e1ce307bd6a9056b4a95fe6f52ff42dc6e03a08)
Diffstat (limited to 'source3/smbd/close.c')
| -rw-r--r-- | source3/smbd/close.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/source3/smbd/close.c b/source3/smbd/close.c index 981c0d77bb..2dba691a1c 100644 --- a/source3/smbd/close.c +++ b/source3/smbd/close.c @@ -103,6 +103,7 @@ void close_file(files_struct *fsp, BOOL normal_close) SMB_INO_T inode = fsp->fd_ptr->inode; int token; BOOL last_reference = False; + BOOL delete_on_close = fsp->fd_ptr->delete_on_close; connection_struct *conn = fsp->conn; remove_pending_lock_requests_by_fid(fsp); @@ -140,7 +141,7 @@ void close_file(files_struct *fsp, BOOL normal_close) * reference to a file. */ - if (normal_close && last_reference && fsp->delete_on_close) { + if (normal_close && last_reference && delete_on_close) { if(dos_unlink(fsp->fsp_name) != 0) DEBUG(0,("close_file: file %s. Delete on close was set and unlink failed \ with error %s\n", fsp->fsp_name, strerror(errno) )); |