From f219d2e07e5001a1738f7331e1b4e9f74db02c02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Pierre=20Andr=C3=A9?= <jpandre@users.sourceforge.net>
Date: Wed, 23 Mar 2011 09:20:10 +0100
Subject: [PATCH] Fixed inconsistent interface to
 ntfs_initialize_file_security()

The "flags" argument of ntfs_initialize_file_security() is intended to
feed the one to ntfs_mount(). Having the same type for both may avoid
future problems.
---
 include/ntfs-3g/security.h |  2 +-
 libntfs-3g/security.c      |  2 +-
 src/secaudit.c             | 14 +++++++++-----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/include/ntfs-3g/security.h b/include/ntfs-3g/security.h
index 0f8f1d31..9d7dd331 100644
--- a/include/ntfs-3g/security.h
+++ b/include/ntfs-3g/security.h
@@ -350,7 +350,7 @@ INDEX_ENTRY *ntfs_read_sii(struct SECURITY_API *scapi,
 INDEX_ENTRY *ntfs_read_sdh(struct SECURITY_API *scapi,
 		INDEX_ENTRY *entry);
 struct SECURITY_API *ntfs_initialize_file_security(const char *device,
-                                int flags);
+                                unsigned long flags);
 BOOL ntfs_leave_file_security(struct SECURITY_API *scx);
 
 int ntfs_get_usid(struct SECURITY_API *scapi, uid_t uid, char *buf);
diff --git a/libntfs-3g/security.c b/libntfs-3g/security.c
index 0203ecc2..b0bbe6ba 100644
--- a/libntfs-3g/security.c
+++ b/libntfs-3g/security.c
@@ -5030,7 +5030,7 @@ int ntfs_get_group(struct SECURITY_API *scapi, const SID *gsid)
  */
 
 struct SECURITY_API *ntfs_initialize_file_security(const char *device,
-				int flags)
+				unsigned long flags)
 {
 	ntfs_volume *vol;
 	unsigned long mntflag;
diff --git a/src/secaudit.c b/src/secaudit.c
index 7485d719..a4b41f01 100644
--- a/src/secaudit.c
+++ b/src/secaudit.c
@@ -178,6 +178,9 @@
  *
  *  May 2010, version 1.3.18
  *     - redefined early error logging
+ *
+ *  Mar 2011, version 1.3.19
+ *     - fixed interface to ntfs_initialize_file_security()
  */
 
 /*
@@ -201,7 +204,7 @@
  *		General parameters which may have to be adapted to needs
  */
 
-#define AUDT_VERSION "1.3.18"
+#define AUDT_VERSION "1.3.19"
 
 #define GET_FILE_SECURITY "ntfs_get_file_security"
 #define SET_FILE_SECURITY "ntfs_set_file_security"
@@ -343,7 +346,7 @@ int ntfs_get_gsid(void *scapi, gid_t gid, char *buf);
 int ntfs_get_user(void *scapi, const char *usid);
 int ntfs_get_group(void *scapi, const char *gsid);
 
-void *ntfs_initialize_file_security(const char *device, int flags);
+void *ntfs_initialize_file_security(const char *device, unsigned long flags);
 BOOL ntfs_leave_file_security(void *scapi);
 
 #else
@@ -369,7 +372,8 @@ typedef int (*type_get_gsid)(void *scapi, gid_t gid, char *buf);
 typedef int (*type_get_user)(void *scapi, const char *usid);
 typedef int (*type_get_group)(void *scapi, const char *gsid);
 
-typedef void *(*type_initialize_file_security)(const char *device, int flags);
+typedef void *(*type_initialize_file_security)(const char *device,
+				unsigned long flags);
 typedef BOOL (*type_leave_file_security)(void *scapi);
 
 type_get_file_security ntfs_get_file_security;
@@ -400,7 +404,7 @@ type_leave_file_security ntfs_leave_file_security;
 BOOL open_security_api(void);
 BOOL close_security_api(void);
 #ifndef WIN32
-BOOL open_volume(const char*, int flags);
+BOOL open_volume(const char*, unsigned long flags);
 BOOL close_volume(const char*);
 #endif
 unsigned int get2l(const char*, int);
@@ -707,7 +711,7 @@ BOOL close_security_api(void)
  *	Assumes a single volume is opened
  */
 
-BOOL open_volume(const char *volume, int flags)
+BOOL open_volume(const char *volume, unsigned long flags)
 {
 	BOOL ok;