r3180: - basic support for SEC_RIGHT_MAXIMUM_ALLOWED in pvfs
[gd/samba-autobuild/.git] / source4 / ntvfs / posix / pvfs_open.c
index 5798aa782fc05b7aaa8bf10e4582d1ff3506e3e6..badd18d370e6296950ff53b9d2ff28b3b885101c 100644 (file)
 #include "include/includes.h"
 #include "vfs_posix.h"
 
+/*
+  create file handles with convenient numbers for sniffers
+*/
+#define PVFS_MIN_FILE_FNUM 0x100
+#define PVFS_MIN_NEW_FNUM 0x200
+#define PVFS_MIN_DIR_FNUM 0x1000
 
 /*
   find open file handle given fnum
@@ -31,18 +37,157 @@ struct pvfs_file *pvfs_find_fd(struct pvfs_state *pvfs,
                               struct smbsrv_request *req, uint16_t fnum)
 {
        struct pvfs_file *f;
-       for (f=pvfs->open_files;f;f=f->next) {
-               if (f->fnum == fnum) {
-                       if (req->session != f->session) {
-                               DEBUG(2,("pvfs_find_fd: attempt to use wrong session for fnum %d\n", fnum));
-                               return NULL;
-                       }
-                       return f;
+
+       f = idr_find(pvfs->idtree_fnum, fnum);
+       if (f == NULL) {
+               return NULL;
+       }
+
+       if (req->session != f->session) {
+               DEBUG(2,("pvfs_find_fd: attempt to use wrong session for fnum %d\n", 
+                        fnum));
+               return NULL;
+       }
+
+       return f;
+}
+
+
+/*
+  cleanup a open directory handle
+*/
+static int pvfs_dir_fd_destructor(void *p)
+{
+       struct pvfs_file *f = p;
+       DLIST_REMOVE(f->pvfs->open_files, f);
+       idr_remove(f->pvfs->idtree_fnum, f->fnum);
+
+       if (f->create_options & NTCREATEX_OPTIONS_DELETE_ON_CLOSE) {
+               if (rmdir(f->name->full_name) != 0) {
+                       DEBUG(0,("pvfs_close: failed to rmdir '%s'\n", 
+                                f->name->full_name));
+               }
+       }
+
+       return 0;
+}
+
+
+/*
+  open a directory
+*/
+static NTSTATUS pvfs_open_directory(struct pvfs_state *pvfs, 
+                                   struct smbsrv_request *req, 
+                                   struct pvfs_filename *name, 
+                                   union smb_open *io)
+{
+       struct pvfs_file *f;
+       int fnum;
+       NTSTATUS status;
+       uint32_t create_action;
+
+       /* if the client says it must be a directory, and it isn't,
+          then fail */
+       if (name->exists && !(name->dos.attrib & FILE_ATTRIBUTE_DIRECTORY)) {
+               return NT_STATUS_NOT_A_DIRECTORY;
+       }
+
+       switch (io->generic.in.open_disposition) {
+       case NTCREATEX_DISP_OPEN_IF:
+               break;
+
+       case NTCREATEX_DISP_OPEN:
+               if (!name->exists) {
+                       return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+               }
+               break;
+
+       case NTCREATEX_DISP_CREATE:
+               if (name->exists) {
+                       return NT_STATUS_OBJECT_NAME_COLLISION;
+               }
+               break;
+
+       case NTCREATEX_DISP_OVERWRITE_IF:
+       case NTCREATEX_DISP_OVERWRITE:
+       case NTCREATEX_DISP_SUPERSEDE:
+       default:
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
+       f = talloc_p(req, struct pvfs_file);
+       if (f == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       fnum = idr_get_new_above(pvfs->idtree_fnum, f, PVFS_MIN_DIR_FNUM, UINT16_MAX);
+       if (fnum == -1) {
+               talloc_free(f);
+               return NT_STATUS_TOO_MANY_OPENED_FILES;
+       }
+
+       f->fnum = fnum;
+       f->fd = -1;
+       f->name = talloc_steal(f, name);
+       f->session = req->session;
+       f->smbpid = req->smbpid;
+       f->pvfs = pvfs;
+       f->pending_list = NULL;
+       f->lock_count = 0;
+       f->locking_key = data_blob(NULL, 0);
+       f->create_options = io->generic.in.create_options;
+       f->share_access = io->generic.in.share_access;
+       f->seek_offset = 0;
+       f->position = 0;
+
+       DLIST_ADD(pvfs->open_files, f);
+
+       /* TODO: should we check in the opendb? Do directory opens 
+          follow the share_access rules? */
+
+
+       /* setup a destructor to avoid leaks on abnormal termination */
+       talloc_set_destructor(f, pvfs_dir_fd_destructor);
+
+       if (!name->exists) {
+               if (mkdir(name->full_name, 0755) == -1) {
+                       return pvfs_map_errno(pvfs,errno);
+               }
+               status = pvfs_resolve_name(pvfs, req, io->ntcreatex.in.fname,
+                                          PVFS_RESOLVE_NO_WILDCARD, &name);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return status;
                }
+               create_action = NTCREATEX_ACTION_CREATED;
+       } else {
+               create_action = NTCREATEX_ACTION_EXISTED;
+       }
+
+       if (!name->exists) {
+               return NT_STATUS_OBJECT_NAME_NOT_FOUND;
        }
-       return NULL;
+
+       /* the open succeeded, keep this handle permanently */
+       talloc_steal(pvfs, f);
+
+       io->generic.out.oplock_level  = NO_OPLOCK;
+       io->generic.out.fnum          = f->fnum;
+       io->generic.out.create_action = create_action;
+       io->generic.out.create_time   = name->dos.create_time;
+       io->generic.out.access_time   = name->dos.access_time;
+       io->generic.out.write_time    = name->dos.write_time;
+       io->generic.out.change_time   = name->dos.change_time;
+       io->generic.out.attrib        = name->dos.attrib;
+       io->generic.out.alloc_size    = 0;
+       io->generic.out.size          = 0;
+       io->generic.out.file_type     = FILE_TYPE_DISK;
+       io->generic.out.ipc_state     = 0;
+       io->generic.out.is_directory  = 1;
+
+       return NT_STATUS_OK;
 }
 
+
 /*
   by using a destructor we make sure that abnormal cleanup will not 
   leak file descriptors (assuming at least the top level pointer is freed, which
@@ -51,20 +196,202 @@ struct pvfs_file *pvfs_find_fd(struct pvfs_state *pvfs,
 static int pvfs_fd_destructor(void *p)
 {
        struct pvfs_file *f = p;
+       struct odb_lock *lck;
+       NTSTATUS status;
+
+       DLIST_REMOVE(f->pvfs->open_files, f);
 
-       brl_close(f->pvfs->brl_context, &f->locking_key, f->fnum);
+       pvfs_lock_close(f->pvfs, f);
 
        if (f->fd != -1) {
                close(f->fd);
                f->fd = -1;
        }
+
+       idr_remove(f->pvfs->idtree_fnum, f->fnum);
+
+       if (f->create_options & NTCREATEX_OPTIONS_DELETE_ON_CLOSE) {
+               if (unlink(f->name->full_name) != 0) {
+                       DEBUG(0,("pvfs_close: failed to delete '%s'\n", 
+                                f->name->full_name));
+               }
+       }
+
+       lck = odb_lock(f, f->pvfs->odb_context, &f->locking_key);
+       if (lck == NULL) {
+               DEBUG(0,("Unable to lock opendb for close\n"));
+               return 0;
+       }
+
+       status = odb_close_file(lck, f->fnum);
+       if (!NT_STATUS_IS_OK(status)) {
+               DEBUG(0,("Unable to remove opendb entry for '%s' - %s\n", 
+                        f->name->full_name, nt_errstr(status)));
+       }
+
+       talloc_free(lck);
+
        return 0;
 }
 
+
+/*
+  form the lock context used for byte range locking and opendb
+  locking. Note that we must zero here to take account of
+  possible padding on some architectures
+*/
+static NTSTATUS pvfs_locking_key(struct pvfs_filename *name, 
+                                TALLOC_CTX *mem_ctx, DATA_BLOB *key)
+{
+       struct {
+               dev_t device;
+               ino_t inode;
+       } lock_context;
+       ZERO_STRUCT(lock_context);
+
+       lock_context.device = name->st.st_dev;
+       lock_context.inode = name->st.st_ino;
+
+       *key = data_blob_talloc(mem_ctx, &lock_context, sizeof(lock_context));
+       if (key->data == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+       
+       return NT_STATUS_OK;
+}
+
+
+/*
+  create a new file
+*/
+static NTSTATUS pvfs_create_file(struct pvfs_state *pvfs, 
+                                struct smbsrv_request *req, 
+                                struct pvfs_filename *name, 
+                                union smb_open *io)
+{
+       struct pvfs_file *f;
+       NTSTATUS status;
+       int flags, fnum, fd;
+       struct odb_lock *lck;
+       uint32_t create_options = io->generic.in.create_options;
+       uint32_t share_access = io->generic.in.share_access;
+       uint32_t access_mask = io->generic.in.access_mask;
+       mode_t mode;
+
+       if ((io->ntcreatex.in.file_attr & FILE_ATTRIBUTE_READONLY) &&
+           (create_options & NTCREATEX_OPTIONS_DELETE_ON_CLOSE)) {
+               return NT_STATUS_CANNOT_DELETE;
+       }
+       
+       if (access_mask & SEC_RIGHT_MAXIMUM_ALLOWED) {
+               access_mask = GENERIC_RIGHTS_FILE_READ | GENERIC_RIGHTS_FILE_WRITE;
+       }
+
+       flags = O_RDWR;
+
+       f = talloc_p(req, struct pvfs_file);
+       if (f == NULL) {
+               return NT_STATUS_NO_MEMORY;
+       }
+
+       fnum = idr_get_new_above(pvfs->idtree_fnum, f, PVFS_MIN_NEW_FNUM, UINT16_MAX);
+       if (fnum == -1) {
+               return NT_STATUS_TOO_MANY_OPENED_FILES;
+       }
+
+       if (io->ntcreatex.in.file_attr & FILE_ATTRIBUTE_READONLY) {
+               mode = 0444;
+       } else {
+               mode = 0644;
+       }
+
+       /* create the file */
+       fd = open(name->full_name, flags | O_CREAT | O_EXCL, mode);
+       if (fd == -1) {
+               idr_remove(pvfs->idtree_fnum, fnum);
+               return pvfs_map_errno(pvfs, errno);
+       }
+
+       /* re-resolve the open fd */
+       status = pvfs_resolve_name_fd(pvfs, fd, name);
+       if (!NT_STATUS_IS_OK(status)) {
+               idr_remove(pvfs->idtree_fnum, fnum);
+               close(fd);
+               return status;
+       }
+
+       /* form the lock context used for byte range locking and
+          opendb locking */
+       status = pvfs_locking_key(name, f, &f->locking_key);
+       if (!NT_STATUS_IS_OK(status)) {
+               idr_remove(pvfs->idtree_fnum, fnum);
+               close(fd);
+               return status;
+       }
+
+       /* grab a lock on the open file record */
+       lck = odb_lock(req, pvfs->odb_context, &f->locking_key);
+       if (lck == NULL) {
+               DEBUG(0,("pvfs_open: failed to lock file '%s' in opendb\n",
+                        name->full_name));
+               /* we were supposed to do a blocking lock, so something
+                  is badly wrong! */
+               idr_remove(pvfs->idtree_fnum, fnum);
+               close(fd);
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       }
+
+       status = odb_open_file(lck, fnum, share_access, create_options, access_mask);
+       if (!NT_STATUS_IS_OK(status)) {
+               /* bad news, we must have hit a race */
+               idr_remove(pvfs->idtree_fnum, fnum);
+               close(fd);
+               return status;
+       }
+
+       f->fnum = fnum;
+       f->fd = fd;
+       f->name = talloc_steal(f, name);
+       f->session = req->session;
+       f->smbpid = req->smbpid;
+       f->pvfs = pvfs;
+       f->pending_list = NULL;
+       f->lock_count = 0;
+       f->create_options = io->generic.in.create_options;
+       f->share_access = io->generic.in.share_access;
+       f->access_mask = access_mask;
+       f->seek_offset = 0;
+       f->position = 0;
+
+       DLIST_ADD(pvfs->open_files, f);
+
+       /* setup a destructor to avoid file descriptor leaks on
+          abnormal termination */
+       talloc_set_destructor(f, pvfs_fd_destructor);
+
+       io->generic.out.oplock_level  = NO_OPLOCK;
+       io->generic.out.fnum          = f->fnum;
+       io->generic.out.create_action = NTCREATEX_ACTION_CREATED;
+       io->generic.out.create_time   = name->dos.create_time;
+       io->generic.out.access_time   = name->dos.access_time;
+       io->generic.out.write_time    = name->dos.write_time;
+       io->generic.out.change_time   = name->dos.change_time;
+       io->generic.out.attrib        = name->dos.attrib;
+       io->generic.out.alloc_size    = name->dos.alloc_size;
+       io->generic.out.size          = name->st.st_size;
+       io->generic.out.file_type     = FILE_TYPE_DISK;
+       io->generic.out.ipc_state     = 0;
+       io->generic.out.is_directory  = 0;
+
+       /* success - keep the file handle */
+       talloc_steal(pvfs, f);
+
+       return NT_STATUS_OK;
+}
+
+
 /*
   open a file
-  TODO: this is a temporary implementation derived from the simple backend
-  its purpose is to allow other tests to run 
 */
 NTSTATUS pvfs_open(struct ntvfs_module_context *ntvfs,
                   struct smbsrv_request *req, union smb_open *io)
@@ -74,11 +401,17 @@ NTSTATUS pvfs_open(struct ntvfs_module_context *ntvfs,
        struct pvfs_filename *name;
        struct pvfs_file *f;
        NTSTATUS status;
-       struct {
-               dev_t device;
-               ino_t inode;
-       } lock_context;
-
+       int fnum;
+       struct odb_lock *lck;
+       uint32_t create_options;
+       uint32_t share_access;
+       uint32_t access_mask;
+
+       /* use the generic mapping code to avoid implementing all the
+          different open calls. This won't allow openx to work
+          perfectly as the mapping code has no way of knowing if two
+          opens are on the same connection, so this will need to
+          change eventually */    
        if (io->generic.level != RAW_OPEN_GENERIC) {
                return ntvfs_map_open(req, io, ntvfs);
        }
@@ -90,111 +423,186 @@ NTSTATUS pvfs_open(struct ntvfs_module_context *ntvfs,
                return status;
        }
 
+       /* directory opens are handled separately */
+       if ((name->exists && (name->dos.attrib & FILE_ATTRIBUTE_DIRECTORY)) ||
+           (io->generic.in.create_options & NTCREATEX_OPTIONS_DIRECTORY)) {
+               return pvfs_open_directory(pvfs, req, name, io);
+       }
+
+       create_options = io->generic.in.create_options;
+       share_access   = io->generic.in.share_access;
+       access_mask    = io->generic.in.access_mask;
+
+       if (access_mask & SEC_RIGHT_MAXIMUM_ALLOWED) {
+               if (name->dos.attrib & FILE_ATTRIBUTE_READONLY) {
+                       access_mask = GENERIC_RIGHTS_FILE_READ;
+               } else {
+                       access_mask = GENERIC_RIGHTS_FILE_READ | GENERIC_RIGHTS_FILE_WRITE;
+               }
+       }
+
+       /* certain create options are not allowed */
+       if ((create_options & NTCREATEX_OPTIONS_DELETE_ON_CLOSE) &&
+           !(access_mask & STD_RIGHT_DELETE_ACCESS)) {
+               return NT_STATUS_INVALID_PARAMETER;
+       }
+
        switch (io->generic.in.open_disposition) {
        case NTCREATEX_DISP_SUPERSEDE:
+               if (!name->exists) {
+                       return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+               }
+               flags = O_TRUNC;
+               break;
+
        case NTCREATEX_DISP_OVERWRITE_IF:
-               flags = O_CREAT | O_TRUNC;
+               flags = O_TRUNC;
                break;
+
        case NTCREATEX_DISP_OPEN:
+               if (!name->exists) {
+                       return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+               }
                flags = 0;
                break;
+
        case NTCREATEX_DISP_OVERWRITE:
+               if (!name->exists) {
+                       return NT_STATUS_OBJECT_NAME_NOT_FOUND;
+               }
                flags = O_TRUNC;
                break;
+
        case NTCREATEX_DISP_CREATE:
-               flags = O_CREAT | O_EXCL;
+               if (name->exists) {
+                       return NT_STATUS_OBJECT_NAME_COLLISION;
+               }
+               flags = 0;
                break;
+
        case NTCREATEX_DISP_OPEN_IF:
-               flags = O_CREAT;
-               break;
-       default:
                flags = 0;
                break;
+
+       default:
+               return NT_STATUS_INVALID_PARAMETER;
        }
-       
-       flags |= O_RDWR;
 
-/* we need to do this differently to support systems without O_DIRECTORY */
-#ifndef O_DIRECTORY
-#define O_DIRECTORY 0
-#endif
+       flags |= O_RDWR;
 
-       if (name->exists &&
-           (io->generic.in.create_options & NTCREATEX_OPTIONS_DIRECTORY) &&
-           !(name->dos.attrib & FILE_ATTRIBUTE_DIRECTORY)) {
-               return NT_STATUS_NOT_A_DIRECTORY;
-       }
+       /* handle creating a new file separately */
+       if (!name->exists) {
+               status = pvfs_create_file(pvfs, req, name, io);
+               if (!NT_STATUS_EQUAL(status, NT_STATUS_OBJECT_NAME_COLLISION)) {
+                       return status;
+               }
 
-       if ((name->exists && name->dos.attrib & FILE_ATTRIBUTE_DIRECTORY) ||
-           (io->generic.in.create_options & NTCREATEX_OPTIONS_DIRECTORY)) {
-               flags = O_RDONLY | O_DIRECTORY;
-               if (pvfs->flags & PVFS_FLAG_READONLY) {
-                       goto do_open;
+               /* we've hit a race - the file was created during this call */
+               if (io->generic.in.open_disposition == NTCREATEX_DISP_CREATE) {
+                       return status;
                }
-               switch (io->generic.in.open_disposition) {
-               case NTCREATEX_DISP_CREATE:
-                       if (mkdir(name->full_name, 0755) == -1) {
-                               return pvfs_map_errno(pvfs,errno);
-                       }
-                       break;
-               case NTCREATEX_DISP_OPEN_IF:
-                       if (mkdir(name->full_name, 0755) == -1 && errno != EEXIST) {
-                               return pvfs_map_errno(pvfs,errno);
-                       }
-                       break;
+
+               /* try re-resolving the name */
+               status = pvfs_resolve_name(pvfs, req, io->ntcreatex.in.fname,
+                                          PVFS_RESOLVE_NO_WILDCARD, &name);
+               if (!NT_STATUS_IS_OK(status)) {
+                       return status;
                }
+               /* fall through to a normal open */
        }
 
-do_open:
-       fd = open(name->full_name, flags, 0644);
-       if (fd == -1) {
-               if (errno == 0)
-                       errno = ENOENT;
-               return pvfs_map_errno(pvfs,errno);
+       if ((name->dos.attrib & FILE_ATTRIBUTE_READONLY) &&
+           (create_options & NTCREATEX_OPTIONS_DELETE_ON_CLOSE)) {
+               return NT_STATUS_CANNOT_DELETE;
        }
 
-       f = talloc_p(pvfs, struct pvfs_file);
+       f = talloc_p(req, struct pvfs_file);
        if (f == NULL) {
-               close(fd);
                return NT_STATUS_NO_MEMORY;
        }
 
-       /* re-resolve the open fd */
-       status = pvfs_resolve_name_fd(pvfs, fd, name);
+       /* allocate a fnum */
+       fnum = idr_get_new_above(pvfs->idtree_fnum, f, PVFS_MIN_FILE_FNUM, UINT16_MAX);
+       if (fnum == -1) {
+               return NT_STATUS_TOO_MANY_OPENED_FILES;
+       }
+
+       /* form the lock context used for byte range locking and
+          opendb locking */
+       status = pvfs_locking_key(name, f, &f->locking_key);
        if (!NT_STATUS_IS_OK(status)) {
+               idr_remove(pvfs->idtree_fnum, fnum);
                return status;
        }
 
-       f->fnum = fd;
-       f->fd = fd;
+       /* get a lock on this file before the actual open */
+       lck = odb_lock(req, pvfs->odb_context, &f->locking_key);
+       if (lck == NULL) {
+               DEBUG(0,("pvfs_open: failed to lock file '%s' in opendb\n",
+                        name->full_name));
+               /* we were supposed to do a blocking lock, so something
+                  is badly wrong! */
+               idr_remove(pvfs->idtree_fnum, fnum);
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       }
+
+       /* see if we are allowed to open at the same time as existing opens */
+       status = odb_open_file(lck, fnum, share_access, create_options, access_mask);
+       if (!NT_STATUS_IS_OK(status)) {
+               idr_remove(pvfs->idtree_fnum, fnum);
+               return status;
+       }
+
+       f->fnum = fnum;
+       f->fd = -1;
        f->name = talloc_steal(f, name);
        f->session = req->session;
        f->smbpid = req->smbpid;
        f->pvfs = pvfs;
+       f->pending_list = NULL;
+       f->lock_count = 0;
+       f->create_options = io->generic.in.create_options;
+       f->share_access = io->generic.in.share_access;
+       f->access_mask = access_mask;
+       f->seek_offset = 0;
+       f->position = 0;
 
-       /* we must zero here to take account of padding */
-       ZERO_STRUCT(lock_context);
-       lock_context.device = name->st.st_dev;
-       lock_context.inode = name->st.st_ino;
-       f->locking_key = data_blob_talloc(f, &lock_context, sizeof(lock_context));
+       DLIST_ADD(pvfs->open_files, f);
 
        /* setup a destructor to avoid file descriptor leaks on
           abnormal termination */
        talloc_set_destructor(f, pvfs_fd_destructor);
 
-       DLIST_ADD(pvfs->open_files, f);
+       /* do the actual open */
+       fd = open(name->full_name, flags);
+       if (fd == -1) {
+               return pvfs_map_errno(pvfs, errno);
+       }
 
-       ZERO_STRUCT(io->generic.out);
-       
-       io->generic.out.create_time = name->dos.create_time;
-       io->generic.out.access_time = name->dos.access_time;
-       io->generic.out.write_time = name->dos.write_time;
-       io->generic.out.change_time = name->dos.change_time;
-       io->generic.out.fnum = f->fnum;
-       io->generic.out.alloc_size = name->dos.alloc_size;
-       io->generic.out.size = name->st.st_size;
-       io->generic.out.attrib = name->dos.attrib;
-       io->generic.out.is_directory = (name->dos.attrib & FILE_ATTRIBUTE_DIRECTORY)?1:0;
+       f->fd = fd;
+
+       /* re-resolve the open fd */
+       status = pvfs_resolve_name_fd(pvfs, fd, name);
+       if (!NT_STATUS_IS_OK(status)) {
+               return status;
+       }
+
+       io->generic.out.oplock_level  = NO_OPLOCK;
+       io->generic.out.fnum          = f->fnum;
+       io->generic.out.create_action = NTCREATEX_ACTION_EXISTED;
+       io->generic.out.create_time   = name->dos.create_time;
+       io->generic.out.access_time   = name->dos.access_time;
+       io->generic.out.write_time    = name->dos.write_time;
+       io->generic.out.change_time   = name->dos.change_time;
+       io->generic.out.attrib        = name->dos.attrib;
+       io->generic.out.alloc_size    = name->dos.alloc_size;
+       io->generic.out.size          = name->st.st_size;
+       io->generic.out.file_type     = FILE_TYPE_DISK;
+       io->generic.out.ipc_state     = 0;
+       io->generic.out.is_directory  = 0;
+
+       /* success - keep the file handle */
+       talloc_steal(pvfs, f);
 
        return NT_STATUS_OK;
 }
@@ -209,10 +617,10 @@ NTSTATUS pvfs_close(struct ntvfs_module_context *ntvfs,
        struct pvfs_state *pvfs = ntvfs->private_data;
        struct pvfs_file *f;
        NTSTATUS status;
+       struct utimbuf unix_times;
 
        if (io->generic.level != RAW_CLOSE_CLOSE) {
-               /* we need a mapping function */
-               return NT_STATUS_INVALID_LEVEL;
+               return ntvfs_map_close(req, io, ntvfs);
        }
 
        f = pvfs_find_fd(pvfs, req, io->close.in.fnum);
@@ -220,20 +628,19 @@ NTSTATUS pvfs_close(struct ntvfs_module_context *ntvfs,
                return NT_STATUS_INVALID_HANDLE;
        }
 
-       status = brl_close(pvfs->brl_context, &f->locking_key, f->fnum);
-       if (!NT_STATUS_IS_OK(status)) {
-               return status;
-       }
-
-       if (close(f->fd) != 0) {
+       unix_times.actime = 0;
+       unix_times.modtime = io->close.in.write_time;
+       utime(f->name->full_name, &unix_times);
+       
+       if (f->fd != -1 && 
+           close(f->fd) == -1) {
                status = pvfs_map_errno(pvfs, errno);
        } else {
                status = NT_STATUS_OK;
        }
+       f->fd = -1;
 
-       talloc_set_destructor(f, NULL);
-
-       DLIST_REMOVE(pvfs->open_files, f);
+       /* the destructor takes care of the rest */
        talloc_free(f);
 
        return status;
@@ -252,7 +659,6 @@ NTSTATUS pvfs_logoff(struct ntvfs_module_context *ntvfs,
        for (f=pvfs->open_files;f;f=next) {
                next = f->next;
                if (f->session == req->session) {
-                       talloc_set_destructor(f, NULL);
                        DLIST_REMOVE(pvfs->open_files, f);
                        talloc_free(f);
                }
@@ -274,7 +680,6 @@ NTSTATUS pvfs_exit(struct ntvfs_module_context *ntvfs,
        for (f=pvfs->open_files;f;f=next) {
                next = f->next;
                if (f->smbpid == req->smbpid) {
-                       talloc_set_destructor(f, NULL);
                        DLIST_REMOVE(pvfs->open_files, f);
                        talloc_free(f);
                }
@@ -282,3 +687,53 @@ NTSTATUS pvfs_exit(struct ntvfs_module_context *ntvfs,
 
        return NT_STATUS_OK;
 }
+
+
+/*
+  change the create options on an already open file
+*/
+NTSTATUS pvfs_change_create_options(struct pvfs_state *pvfs,
+                                   struct smbsrv_request *req, 
+                                   struct pvfs_file *f, uint32_t create_options)
+{
+       struct odb_lock *lck;
+       NTSTATUS status;
+
+       if (f->create_options == create_options) {
+               return NT_STATUS_OK;
+       }
+
+       if ((f->name->dos.attrib & FILE_ATTRIBUTE_READONLY) &&
+           (create_options & NTCREATEX_OPTIONS_DELETE_ON_CLOSE)) {
+               return NT_STATUS_CANNOT_DELETE;
+       }
+
+       lck = odb_lock(req, pvfs->odb_context, &f->locking_key);
+       if (lck == NULL) {
+               return NT_STATUS_INTERNAL_DB_CORRUPTION;
+       }
+
+       status = odb_set_create_options(lck, f->fnum, create_options);
+       if (NT_STATUS_IS_OK(status)) {
+               f->create_options = create_options;
+       }
+
+       return status;
+}
+
+
+/*
+  determine if a file is open - used to prevent some operations on open files
+*/
+BOOL pvfs_is_open(struct pvfs_state *pvfs, struct pvfs_filename *name)
+{
+       NTSTATUS status;
+       DATA_BLOB key;
+
+       status = pvfs_locking_key(name, name, &key);
+       if (!NT_STATUS_IS_OK(status)) {
+               return False;
+       }
+
+       return odb_is_open(pvfs->odb_context, &key);
+}