Imported Upstream version 4.0.0+dfsg1

[abartlet/samba-debian.git] / source4 / ntvfs / posix / vfs_posix.h

diff --git a/source4/ntvfs/posix/vfs_posix.h b/source4/ntvfs/posix/vfs_posix.h
index d60369df5016e312071e1a80c679fcf829e551da..9a03658040fbf6336654fae1c42d2634fe5fd86c 100644 (file)
--- a/source4/ntvfs/posix/vfs_posix.h
+++ b/source4/ntvfs/posix/vfs_posix.h
@@ -131,6 +131,7 @@ struct pvfs_filename {
        bool has_wildcard;
        bool exists;          /* true if the base filename exists */
        bool stream_exists;   /* true if the stream exists */
+       bool allow_override;
        struct stat st;
        struct pvfs_dos_fileinfo dos;
 };
@@ -204,7 +205,7 @@ struct pvfs_file {
        /* a file handle to be used for byte range locking */
        struct brl_handle *brl_handle;
 
-       /* a count of active locks - used to avoid calling brl_close on
+       /* a count of active locks - used to avoid calling brlock_close on
           file close */
        uint64_t lock_count;