mirrors/ntfs-3g
0
0
Fork 0
mirror of https://git.code.sf.net/p/ntfs-3g/ntfs-3g.git synced 2024-11-23 18:14:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed inconsistent interface to ntfs_initialize_file_security()

Browse Source
This commit is contained in:
Jean-Pierre André 2011-04-13 17:02:51 +02:00
parent 3c30a0e798
commit e9e3b18711
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/ntfs-3g/security.h
View File

@ -350,7 +350,7 @@ INDEX_ENTRY *ntfs_read_sii(struct SECURITY_API *scapi,
INDEX_ENTRY *ntfs_read_sdh(struct SECURITY_API *scapi, INDEX_ENTRY *ntfs_read_sdh(struct SECURITY_API *scapi,
INDEX_ENTRY *entry); INDEX_ENTRY *entry);
struct SECURITY_API *ntfs_initialize_file_security(const char *device, struct SECURITY_API *ntfs_initialize_file_security(const char *device,
int flags); unsigned long flags);
BOOL ntfs_leave_file_security(struct SECURITY_API *scx); BOOL ntfs_leave_file_security(struct SECURITY_API *scx);
int ntfs_get_usid(struct SECURITY_API *scapi, uid_t uid, char *buf); int ntfs_get_usid(struct SECURITY_API *scapi, uid_t uid, char *buf);

2
libntfs-3g/security.c
View File

@ -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, struct SECURITY_API *ntfs_initialize_file_security(const char *device,
int flags) unsigned long flags)
{ {
ntfs_volume *vol; ntfs_volume *vol;
unsigned long mntflag; unsigned long mntflag;

14
src/secaudit.c
View File

@ -178,6 +178,9 @@
* *
* May 2010, version 1.3.18 * May 2010, version 1.3.18
* - redefined early error logging * - 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 * 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 GET_FILE_SECURITY "ntfs_get_file_security"
#define SET_FILE_SECURITY "ntfs_set_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_user(void *scapi, const char *usid);
int ntfs_get_group(void *scapi, const char *gsid); 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); BOOL ntfs_leave_file_security(void *scapi);
#else #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_user)(void *scapi, const char *usid);
typedef int (*type_get_group)(void *scapi, const char *gsid); 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); typedef BOOL (*type_leave_file_security)(void *scapi);
type_get_file_security ntfs_get_file_security; 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 open_security_api(void);
BOOL close_security_api(void); BOOL close_security_api(void);
#ifndef WIN32 #ifndef WIN32
BOOL open_volume(const char*, int flags); BOOL open_volume(const char*, unsigned long flags);
BOOL close_volume(const char*); BOOL close_volume(const char*);
#endif #endif
unsigned int get2l(const char*, int); unsigned int get2l(const char*, int);
@ -707,7 +711,7 @@ BOOL close_security_api(void)
* Assumes a single volume is opened * 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; BOOL ok;