From 7f9fd9f4ea6be937c9c9ff91d64d4d65d0e22f5e Mon Sep 17 00:00:00 2001
From: jpandre <jpandre>
Date: Wed, 31 Oct 2007 07:29:56 +0000
Subject: [PATCH] Reorganized file creation to avoid temporary settings
 (continued)

---
 include/ntfs-3g/security.h | 4 +++-
 include/ntfs-3g/volume.h   | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/include/ntfs-3g/security.h b/include/ntfs-3g/security.h
index 9cf478ec..6ee59e75 100644
--- a/include/ntfs-3g/security.h
+++ b/include/ntfs-3g/security.h
@@ -70,7 +70,7 @@ struct CACHED_SECURID {
 	struct CACHED_SECURID *next;
 	uid_t uid;
 	gid_t gid;
-	unsigned int mode;
+	unsigned int dmode;
 	le32 securid;
 } ;
 
@@ -166,6 +166,8 @@ int ntfs_allowed_access(struct SECURITY_CONTEXT *scx, const char *path,
 BOOL ntfs_allowed_dir_access(struct SECURITY_CONTEXT *scx,
 		const char *path, int accesstype);
 
+le32 ntfs_alloc_securid(struct SECURITY_CONTEXT *scx,
+		uid_t uid, gid_t gid, mode_t mode, BOOL isdir);
 int ntfs_set_owner(struct SECURITY_CONTEXT *scx,
 		const char *path, ntfs_inode *ni, uid_t uid, gid_t gid);
 int ntfs_set_owner_mode(struct SECURITY_CONTEXT *scx,
diff --git a/include/ntfs-3g/volume.h b/include/ntfs-3g/volume.h
index 82eec25b..b15849ca 100644
--- a/include/ntfs-3g/volume.h
+++ b/include/ntfs-3g/volume.h
@@ -198,6 +198,7 @@ struct _ntfs_volume {
 	ntfs_inode *secure_ni;	/* ntfs_inode structure for FILE $Secure */
 	ntfs_index_context *secure_xsii; /* index for using $Secure:$SII */
 	ntfs_index_context *secure_xsdh; /* index for using $Secure:$SDH */
+	int secure_reentry;  /* check for non-rentries */
 	unsigned int secure_flags;  /* flags, see security.h for values */
 
 	int mftmirr_size;	/* Size of the FILE_MFTMirr in mft records. */