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.

1 files changed, 4 insertions, 7 deletions

diff --git a/source/smbd/trans2.c b/source/smbd/trans2.c
index 5b057410cad..f8d90cd8718 100644
--- a/source/smbd/trans2.c
+++ b/source/smbd/trans2.c
@@ -1658,14 +1658,11 @@ static int call_trans2setfilepathinfo(connection_struct *conn,
         if(fsp->is_directory)
           return(ERROR(ERRDOS,ERRnoaccess));
         /*
-         * TODO - check here is this means set
-         * this flag bit on all open files that
-         * reference this particular dev/inode pair.
-         * If so we'll need to search the open
-         * file entries here and set this flag on 
-         * all of them that match. JRA.
+         * Set the delete on close flag in the reference
+         * counted struct. Delete when the last reference
+         * goes away.
          */
-        fsp->delete_on_close = CVAL(pdata,0);
+        fsp->fd_ptr->delete_on_close = CVAL(pdata,0);
       } else
         return(ERROR(ERRDOS,ERRunknownlevel));
       break;