opengnsys
/
ntfs-3g
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made where permissions are checked easier to select, and logged selection

PERMISSION_HANDLING_BRANCH
jpandre 2009-12-18 09:08:15 +00:00
parent 9dd9daeb6d
commit d9eae2038b
1 changed files with 78 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

133
src/ntfs-3g.c
View File

@ -103,9 +103,18 @@
#include "logging.h" #include "logging.h"
#include "misc.h" #include "misc.h"
#define KERNELACLS 0 /* do not want ACLs checked by kernel */
/* fuse patch required for KERNELACLS ! */
#define KERNELPERMS 1 /* want permissions checked by kernel */
#define CACHEING 0 /* Fuse cacheing; broken, do no use ! */
#if KERNELACLS & !KERNELPERMS
#error Incompatible options KERNELACLS and KERNELPERMS
#endif
/* sometimes the kernel cannot check access */ /* sometimes the kernel cannot check access */
#define ntfs_real_allowed_access(scx, ni, type) ntfs_allowed_access(scx, ni, type) #define ntfs_real_allowed_access(scx, ni, type) ntfs_allowed_access(scx, ni, type)
#if POSIXACLS #if POSIXACLS & KERNELPERMS & !KERNELACLS
/* short-circuit if PERMS checked by kernel and ACLs by fs */ /* short-circuit if PERMS checked by kernel and ACLs by fs */
#define ntfs_allowed_access(scx, ni, type) \ #define ntfs_allowed_access(scx, ni, type) \
((scx)->vol->secure_flags & (1 << SECURITY_DEFAULT) \ ((scx)->vol->secure_flags & (1 << SECURITY_DEFAULT) \
@ -185,7 +194,7 @@ static u32 ntfs_sequence;
static const char *usage_msg = static const char *usage_msg =
"\n" "\n"
"%s %s %s %d - Third Generation NTFS Driver\n" "%s %s %s %d - Third Generation NTFS Driver\n"
"\t\t" "\t\tConfiguration type %d, "
#ifdef HAVE_SETXATTR #ifdef HAVE_SETXATTR
"XATTRS are on, " "XATTRS are on, "
#else #else
@ -304,7 +313,7 @@ static BOOL ntfs_fuse_fill_security_context(struct SECURITY_CONTEXT *scx)
return (ctx->security.mapping[MAPUSERS] != (struct MAPPING*)NULL); return (ctx->security.mapping[MAPUSERS] != (struct MAPPING*)NULL);
} }
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
/* /*
* Check access to parent directory * Check access to parent directory
@ -328,7 +337,7 @@ static int ntfs_allowed_dir_access(struct SECURITY_CONTEXT *scx,
char *name; char *name;
struct stat stbuf; struct stat stbuf;
#if POSIXACLS #if POSIXACLS & KERNELPERMS & !KERNELACLS
/* short-circuit if PERMS checked by kernel and ACLs by fs */ /* short-circuit if PERMS checked by kernel and ACLs by fs */
if (scx->vol->secure_flags & (1 << SECURITY_DEFAULT)) if (scx->vol->secure_flags & (1 << SECURITY_DEFAULT))
allowed = 1; allowed = 1;
@ -671,7 +680,7 @@ static int ntfs_fuse_getattr(const char *org_path, struct stat *stbuf)
goto exit; goto exit;
} }
withusermapping = ntfs_fuse_fill_security_context(&security); withusermapping = ntfs_fuse_fill_security_context(&security);
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
/* /*
* make sure the parent directory is searchable * make sure the parent directory is searchable
*/ */
@ -999,7 +1008,7 @@ static int ntfs_fuse_filler(ntfs_fuse_fill_context_t *fill_ctx,
return ret; return ret;
} }
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
static int ntfs_fuse_opendir(const char *path, static int ntfs_fuse_opendir(const char *path,
struct fuse_file_info *fi) struct fuse_file_info *fi)
@ -1068,7 +1077,7 @@ static int ntfs_fuse_readdir(const char *path, void *buf,
} }
static int ntfs_fuse_open(const char *org_path, static int ntfs_fuse_open(const char *org_path,
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
struct fuse_file_info *fi) struct fuse_file_info *fi)
#else #else
struct fuse_file_info *fi __attribute__((unused))) struct fuse_file_info *fi __attribute__((unused)))
@ -1080,7 +1089,7 @@ static int ntfs_fuse_open(const char *org_path,
char *path = NULL; char *path = NULL;
ntfschar *stream_name; ntfschar *stream_name;
int stream_name_len; int stream_name_len;
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
int accesstype; int accesstype;
struct SECURITY_CONTEXT security; struct SECURITY_CONTEXT security;
#endif #endif
@ -1092,7 +1101,7 @@ static int ntfs_fuse_open(const char *org_path,
if (ni) { if (ni) {
na = ntfs_attr_open(ni, AT_DATA, stream_name, stream_name_len); na = ntfs_attr_open(ni, AT_DATA, stream_name, stream_name_len);
if (na) { if (na) {
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
if (ntfs_fuse_fill_security_context(&security)) { if (ntfs_fuse_fill_security_context(&security)) {
if (fi->flags & O_WRONLY) if (fi->flags & O_WRONLY)
accesstype = S_IWRITE; accesstype = S_IWRITE;
@ -1304,7 +1313,7 @@ out:
*/ */
static int ntfs_fuse_trunc(const char *org_path, off_t size, static int ntfs_fuse_trunc(const char *org_path, off_t size,
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
BOOL chkwrite) BOOL chkwrite)
#else #else
BOOL chkwrite __attribute__((unused))) BOOL chkwrite __attribute__((unused)))
@ -1317,7 +1326,7 @@ static int ntfs_fuse_trunc(const char *org_path, off_t size,
ntfschar *stream_name; ntfschar *stream_name;
int stream_name_len; int stream_name_len;
s64 oldsize; s64 oldsize;
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
struct SECURITY_CONTEXT security; struct SECURITY_CONTEXT security;
#endif #endif
@ -1331,7 +1340,7 @@ static int ntfs_fuse_trunc(const char *org_path, off_t size,
na = ntfs_attr_open(ni, AT_DATA, stream_name, stream_name_len); na = ntfs_attr_open(ni, AT_DATA, stream_name, stream_name_len);
if (!na) if (!na)
goto exit; goto exit;
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
/* /*
* JPA deny truncation if cannot search in parent directory * JPA deny truncation if cannot search in parent directory
* or cannot write to file (already checked for ftruncate()) * or cannot write to file (already checked for ftruncate())
@ -1413,7 +1422,7 @@ static int ntfs_fuse_chmod(const char *path,
else else
res = -EOPNOTSUPP; res = -EOPNOTSUPP;
} else { } else {
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
/* parent directory must be executable */ /* parent directory must be executable */
if (ntfs_allowed_dir_access(&security,path, if (ntfs_allowed_dir_access(&security,path,
(ntfs_inode*)NULL,(ntfs_inode*)NULL,S_IEXEC)) { (ntfs_inode*)NULL,(ntfs_inode*)NULL,S_IEXEC)) {
@ -1430,7 +1439,7 @@ static int ntfs_fuse_chmod(const char *path,
if (ntfs_inode_close(ni)) if (ntfs_inode_close(ni))
set_fuse_error(&res); set_fuse_error(&res);
} }
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
} else } else
res = -errno; res = -errno;
#endif #endif
@ -1455,7 +1464,7 @@ static int ntfs_fuse_chown(const char *path, uid_t uid, gid_t gid)
} else { } else {
res = 0; res = 0;
if (((int)uid != -1) || ((int)gid != -1)) { if (((int)uid != -1) || ((int)gid != -1)) {
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
/* parent directory must be executable */ /* parent directory must be executable */
if (ntfs_allowed_dir_access(&security,path, if (ntfs_allowed_dir_access(&security,path,
@ -1473,7 +1482,7 @@ static int ntfs_fuse_chown(const char *path, uid_t uid, gid_t gid)
if (ntfs_inode_close(ni)) if (ntfs_inode_close(ni))
set_fuse_error(&res); set_fuse_error(&res);
} }
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
} else } else
res = -errno; res = -errno;
#endif #endif
@ -1482,7 +1491,7 @@ static int ntfs_fuse_chown(const char *path, uid_t uid, gid_t gid)
return (res); return (res);
} }
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
static int ntfs_fuse_access(const char *path, int type) static int ntfs_fuse_access(const char *path, int type)
{ {
@ -1569,7 +1578,7 @@ static int ntfs_fuse_create(const char *org_path, mode_t typemode, dev_t dev,
res = -errno; res = -errno;
goto exit; goto exit;
} }
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
/* make sure parent directory is writeable and executable */ /* make sure parent directory is writeable and executable */
if (!ntfs_fuse_fill_security_context(&security) if (!ntfs_fuse_fill_security_context(&security)
|| ntfs_allowed_access(&security, || ntfs_allowed_access(&security,
@ -1665,7 +1674,7 @@ static int ntfs_fuse_create(const char *org_path, mode_t typemode, dev_t dev,
ntfs_fuse_update_times(dir_ni, NTFS_UPDATE_MCTIME); ntfs_fuse_update_times(dir_ni, NTFS_UPDATE_MCTIME);
} else } else
res = -errno; res = -errno;
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
} else } else
res = -errno; res = -errno;
#endif #endif
@ -1782,7 +1791,7 @@ static int ntfs_fuse_link(const char *old_path, const char *new_path)
ntfs_inode *dir_ni = NULL, *ni; ntfs_inode *dir_ni = NULL, *ni;
char *path; char *path;
int res = 0, uname_len; int res = 0, uname_len;
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
BOOL samedir; BOOL samedir;
struct SECURITY_CONTEXT security; struct SECURITY_CONTEXT security;
#endif #endif
@ -1817,7 +1826,7 @@ static int ntfs_fuse_link(const char *old_path, const char *new_path)
goto exit; goto exit;
} }
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
samedir = !strncmp(old_path, path, strlen(path)) samedir = !strncmp(old_path, path, strlen(path))
&& (old_path[strlen(path)] == '/'); && (old_path[strlen(path)] == '/');
/* JPA make sure the parent directories are writeable */ /* JPA make sure the parent directories are writeable */
@ -1859,7 +1868,7 @@ static int ntfs_fuse_rm(const char *org_path)
ntfs_inode *dir_ni = NULL, *ni; ntfs_inode *dir_ni = NULL, *ni;
char *path; char *path;
int res = 0, uname_len; int res = 0, uname_len;
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
struct SECURITY_CONTEXT security; struct SECURITY_CONTEXT security;
#endif #endif
@ -1888,7 +1897,7 @@ static int ntfs_fuse_rm(const char *org_path)
goto exit; goto exit;
} }
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
/* JPA deny unlinking if directory is not writable and executable */ /* JPA deny unlinking if directory is not writable and executable */
if (!ntfs_fuse_fill_security_context(&security) if (!ntfs_fuse_fill_security_context(&security)
|| ntfs_allowed_dir_access(&security, org_path, dir_ni, ni, || ntfs_allowed_dir_access(&security, org_path, dir_ni, ni,
@ -1899,7 +1908,7 @@ static int ntfs_fuse_rm(const char *org_path)
res = -errno; res = -errno;
/* ntfs_delete() always closes ni and dir_ni */ /* ntfs_delete() always closes ni and dir_ni */
ni = dir_ni = NULL; ni = dir_ni = NULL;
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
} else } else
res = -EACCES; res = -EACCES;
#endif #endif
@ -1937,7 +1946,7 @@ static int ntfs_fuse_unlink(const char *org_path)
ntfschar *stream_name; ntfschar *stream_name;
int stream_name_len; int stream_name_len;
int res = 0; int res = 0;
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
struct SECURITY_CONTEXT security; struct SECURITY_CONTEXT security;
#endif #endif
@ -1947,7 +1956,7 @@ static int ntfs_fuse_unlink(const char *org_path)
if (!stream_name_len) if (!stream_name_len)
res = ntfs_fuse_rm(path); res = ntfs_fuse_rm(path);
else { else {
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
/* /*
* JPA deny unlinking stream if directory is not * JPA deny unlinking stream if directory is not
* writable and executable (debatable) * writable and executable (debatable)
@ -2023,7 +2032,7 @@ static int ntfs_fuse_rename_existing_dest(const char *old_path, const char *new_
int ret, len; int ret, len;
char *tmp; char *tmp;
const char *ext = ".ntfs-3g-"; const char *ext = ".ntfs-3g-";
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
struct SECURITY_CONTEXT security; struct SECURITY_CONTEXT security;
#endif #endif
@ -2039,7 +2048,7 @@ static int ntfs_fuse_rename_existing_dest(const char *old_path, const char *new_
ntfs_log_error("snprintf failed: %d != %d\n", ret, len - 1); ntfs_log_error("snprintf failed: %d != %d\n", ret, len - 1);
ret = -EOVERFLOW; ret = -EOVERFLOW;
} else { } else {
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
/* /*
* Make sure existing dest can be removed. * Make sure existing dest can be removed.
* This is only needed if parent directory is * This is only needed if parent directory is
@ -2154,7 +2163,7 @@ static int ntfs_fuse_utime(const char *path, struct utimbuf *buf)
{ {
ntfs_inode *ni; ntfs_inode *ni;
int res = 0; int res = 0;
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
BOOL ownerok; BOOL ownerok;
BOOL writeok; BOOL writeok;
struct SECURITY_CONTEXT security; struct SECURITY_CONTEXT security;
@ -2162,7 +2171,7 @@ static int ntfs_fuse_utime(const char *path, struct utimbuf *buf)
if (ntfs_fuse_is_named_data_stream(path)) if (ntfs_fuse_is_named_data_stream(path))
return -EINVAL; /* n/a for named data streams. */ return -EINVAL; /* n/a for named data streams. */
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
/* parent directory must be executable */ /* parent directory must be executable */
if (ntfs_fuse_fill_security_context(&security) if (ntfs_fuse_fill_security_context(&security)
&& !ntfs_allowed_dir_access(&security,path, && !ntfs_allowed_dir_access(&security,path,
@ -2174,7 +2183,7 @@ static int ntfs_fuse_utime(const char *path, struct utimbuf *buf)
if (!ni) if (!ni)
return -errno; return -errno;
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
ownerok = ntfs_allowed_as_owner(&security, ni); ownerok = ntfs_allowed_as_owner(&security, ni);
if (buf) { if (buf) {
/* /*
@ -2483,10 +2492,10 @@ static int ntfs_fuse_listxattr(const char *path, char *list, size_t size)
ntfs_inode *ni; ntfs_inode *ni;
char *to = list; char *to = list;
int ret = 0; int ret = 0;
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
struct SECURITY_CONTEXT security; struct SECURITY_CONTEXT security;
#endif #endif
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
/* parent directory must be executable */ /* parent directory must be executable */
if (ntfs_fuse_fill_security_context(&security) if (ntfs_fuse_fill_security_context(&security)
&& !ntfs_allowed_dir_access(&security,path,(ntfs_inode*)NULL, && !ntfs_allowed_dir_access(&security,path,(ntfs_inode*)NULL,
@ -2497,7 +2506,7 @@ static int ntfs_fuse_listxattr(const char *path, char *list, size_t size)
ni = ntfs_pathname_to_inode(ctx->vol, NULL, path); ni = ntfs_pathname_to_inode(ctx->vol, NULL, path);
if (!ni) if (!ni)
return -errno; return -errno;
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
/* file must be readable */ /* file must be readable */
if (!ntfs_allowed_access(&security,ni,S_IREAD)) { if (!ntfs_allowed_access(&security,ni,S_IREAD)) {
ret = -EACCES; ret = -EACCES;
@ -2591,13 +2600,13 @@ static int ntfs_fuse_getxattr_windows(const char *path, const char *name,
ntfs_inode *ni; ntfs_inode *ni;
char *to = value; char *to = value;
int ret = 0; int ret = 0;
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
struct SECURITY_CONTEXT security; struct SECURITY_CONTEXT security;
#endif #endif
if (strcmp(name, "ntfs.streams.list")) if (strcmp(name, "ntfs.streams.list"))
return -EOPNOTSUPP; return -EOPNOTSUPP;
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
/* parent directory must be executable */ /* parent directory must be executable */
if (ntfs_fuse_fill_security_context(&security) if (ntfs_fuse_fill_security_context(&security)
&& !ntfs_allowed_dir_access(&security,path,(ntfs_inode*)NULL, && !ntfs_allowed_dir_access(&security,path,(ntfs_inode*)NULL,
@ -2608,7 +2617,7 @@ static int ntfs_fuse_getxattr_windows(const char *path, const char *name,
ni = ntfs_pathname_to_inode(ctx->vol, NULL, path); ni = ntfs_pathname_to_inode(ctx->vol, NULL, path);
if (!ni) if (!ni)
return -errno; return -errno;
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
if (!ntfs_allowed_access(&security,ni,S_IREAD)) { if (!ntfs_allowed_access(&security,ni,S_IREAD)) {
ret = -errno; ret = -errno;
goto exit; goto exit;
@ -2757,7 +2766,7 @@ static int ntfs_fuse_getxattr(const char *path, const char *name,
attr = mapped_xattr_system(name); attr = mapped_xattr_system(name);
if (attr != XATTR_UNMAPPED) { if (attr != XATTR_UNMAPPED) {
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
/* /*
* hijack internal data and ACL retrieval, whatever * hijack internal data and ACL retrieval, whatever
* mode was selected for xattr (from the user's * mode was selected for xattr (from the user's
@ -2805,7 +2814,7 @@ static int ntfs_fuse_getxattr(const char *path, const char *name,
namespace = xattr_namespace(name); namespace = xattr_namespace(name);
if (namespace == XATTRNS_NONE) if (namespace == XATTRNS_NONE)
return -EOPNOTSUPP; return -EOPNOTSUPP;
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
/* parent directory must be executable */ /* parent directory must be executable */
if (ntfs_fuse_fill_security_context(&security) if (ntfs_fuse_fill_security_context(&security)
&& !ntfs_allowed_dir_access(&security,path,(ntfs_inode*)NULL, && !ntfs_allowed_dir_access(&security,path,(ntfs_inode*)NULL,
@ -2820,7 +2829,7 @@ static int ntfs_fuse_getxattr(const char *path, const char *name,
ni = ntfs_pathname_to_inode(ctx->vol, NULL, path); ni = ntfs_pathname_to_inode(ctx->vol, NULL, path);
if (!ni) if (!ni)
return -errno; return -errno;
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
/* file must be readable */ /* file must be readable */
if (!ntfs_allowed_access(&security, ni, S_IREAD)) { if (!ntfs_allowed_access(&security, ni, S_IREAD)) {
res = -errno; res = -errno;
@ -2948,7 +2957,7 @@ static int ntfs_fuse_setxattr(const char *path, const char *name,
attr = mapped_xattr_system(name); attr = mapped_xattr_system(name);
if (attr != XATTR_UNMAPPED) { if (attr != XATTR_UNMAPPED) {
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
/* /*
* hijack internal data and ACL setting, whatever * hijack internal data and ACL setting, whatever
* mode was selected for xattr (from the user's * mode was selected for xattr (from the user's
@ -3012,7 +3021,7 @@ static int ntfs_fuse_setxattr(const char *path, const char *name,
namespace = xattr_namespace(name); namespace = xattr_namespace(name);
if (namespace == XATTRNS_NONE) if (namespace == XATTRNS_NONE)
return -EOPNOTSUPP; return -EOPNOTSUPP;
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
/* parent directory must be executable */ /* parent directory must be executable */
if (ntfs_fuse_fill_security_context(&security) if (ntfs_fuse_fill_security_context(&security)
&& !ntfs_allowed_dir_access(&security,path,(ntfs_inode*)NULL, && !ntfs_allowed_dir_access(&security,path,(ntfs_inode*)NULL,
@ -3028,7 +3037,7 @@ static int ntfs_fuse_setxattr(const char *path, const char *name,
ni = ntfs_pathname_to_inode(ctx->vol, NULL, path); ni = ntfs_pathname_to_inode(ctx->vol, NULL, path);
if (!ni) if (!ni)
return -errno; return -errno;
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
switch (namespace) { switch (namespace) {
case XATTRNS_SECURITY : case XATTRNS_SECURITY :
case XATTRNS_TRUSTED : case XATTRNS_TRUSTED :
@ -3213,13 +3222,13 @@ static int ntfs_fuse_removexattr(const char *path, const char *name)
int res = 0, lename_len; int res = 0, lename_len;
int attr; int attr;
int namespace; int namespace;
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
struct SECURITY_CONTEXT security; struct SECURITY_CONTEXT security;
#endif #endif
attr = mapped_xattr_system(name); attr = mapped_xattr_system(name);
if (attr != XATTR_UNMAPPED) { if (attr != XATTR_UNMAPPED) {
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
/* /*
* hijack internal data and ACL removal, whatever * hijack internal data and ACL removal, whatever
@ -3248,7 +3257,7 @@ static int ntfs_fuse_removexattr(const char *path, const char *name)
namespace = xattr_namespace(name); namespace = xattr_namespace(name);
if (namespace == XATTRNS_NONE) if (namespace == XATTRNS_NONE)
return -EOPNOTSUPP; return -EOPNOTSUPP;
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
/* parent directory must be executable */ /* parent directory must be executable */
if (ntfs_fuse_fill_security_context(&security) if (ntfs_fuse_fill_security_context(&security)
&& !ntfs_allowed_dir_access(&security,path,(ntfs_inode*)NULL, && !ntfs_allowed_dir_access(&security,path,(ntfs_inode*)NULL,
@ -3264,7 +3273,7 @@ static int ntfs_fuse_removexattr(const char *path, const char *name)
ni = ntfs_pathname_to_inode(ctx->vol, NULL, path); ni = ntfs_pathname_to_inode(ctx->vol, NULL, path);
if (!ni) if (!ni)
return -errno; return -errno;
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
switch (namespace) { switch (namespace) {
case XATTRNS_SECURITY : case XATTRNS_SECURITY :
case XATTRNS_TRUSTED : case XATTRNS_TRUSTED :
@ -3374,7 +3383,7 @@ static struct fuse_operations ntfs_3g_ops = {
.utime = ntfs_fuse_utime, .utime = ntfs_fuse_utime,
.bmap = ntfs_fuse_bmap, .bmap = ntfs_fuse_bmap,
.destroy = ntfs_fuse_destroy2, .destroy = ntfs_fuse_destroy2,
#if POSIXACLS #if !KERNELPERMS | (POSIXACLS & !KERNELACLS)
.access = ntfs_fuse_access, .access = ntfs_fuse_access,
.opendir = ntfs_fuse_opendir, .opendir = ntfs_fuse_opendir,
#endif #endif
@ -3756,7 +3765,8 @@ err_exit:
static void usage(void) static void usage(void)
{ {
ntfs_log_info(usage_msg, EXEC_NAME, VERSION, FUSE_TYPE, fuse_version(), ntfs_log_info(usage_msg, EXEC_NAME, VERSION, FUSE_TYPE, fuse_version(),
EXEC_NAME, ntfs_home); 4 + POSIXACLS*6 - KERNELPERMS*3 + CACHEING,
EXEC_NAME, ntfs_home);
} }
#ifndef HAVE_REALPATH #ifndef HAVE_REALPATH
@ -4015,8 +4025,13 @@ static struct fuse *mount_fuse(char *parsed_options)
if (fuse_opt_add_arg(&args, "") == -1) if (fuse_opt_add_arg(&args, "") == -1)
goto err; goto err;
#if !CACHEING
if (fuse_opt_add_arg(&args, "-ouse_ino,kernel_cache,attr_timeout=0") == -1) if (fuse_opt_add_arg(&args, "-ouse_ino,kernel_cache,attr_timeout=0") == -1)
goto err; goto err;
#else
if (fuse_opt_add_arg(&args, "-ouse_ino,kernel_cache,attr_timeout=1") == -1)
goto err;
#endif
if (ctx->debug) if (ctx->debug)
if (fuse_opt_add_arg(&args, "-odebug") == -1) if (fuse_opt_add_arg(&args, "-odebug") == -1)
goto err; goto err;
@ -4147,9 +4162,7 @@ int main(int argc, char *argv[])
if (fstype == FSTYPE_NONE || fstype == FSTYPE_UNKNOWN) if (fstype == FSTYPE_NONE || fstype == FSTYPE_UNKNOWN)
fstype = load_fuse_module(); fstype = load_fuse_module();
create_dev_fuse(); create_dev_fuse();
if (drop_privs()) if (drop_privs())
goto err_out; goto err_out;
#endif #endif
@ -4190,9 +4203,17 @@ int main(int argc, char *argv[])
#if POSIXACLS #if POSIXACLS
if (ctx->vol->secure_flags & (1 << SECURITY_DEFAULT)) if (ctx->vol->secure_flags & (1 << SECURITY_DEFAULT))
permissions_mode = "User mapping built, Posix ACLs not used"; permissions_mode = "User mapping built, Posix ACLs not used";
else else {
permissions_mode = "User mapping built, Posix ACLs in use"; permissions_mode = "User mapping built, Posix ACLs in use";
#else #if KERNELACLS
if (strappend(&parsed_options, ",default_permissions,acl")) {
err = NTFS_VOLUME_SYNTAX_ERROR;
goto err_out;
}
#endif /* KERNELACLS */
}
#else /* POSIXACLS */
#if KERNELPERMS
if (!(ctx->vol->secure_flags & (1 << SECURITY_DEFAULT))) { if (!(ctx->vol->secure_flags & (1 << SECURITY_DEFAULT))) {
/* /*
* No explicit option but user mapping found * No explicit option but user mapping found
@ -4204,8 +4225,9 @@ int main(int argc, char *argv[])
goto err_out; goto err_out;
} }
} }
#endif /* KERNELPERMS */
permissions_mode = "User mapping built"; permissions_mode = "User mapping built";
#endif #endif /* POSIXACLS */
} else { } else {
ctx->security.uid = ctx->uid; ctx->security.uid = ctx->uid;
ctx->security.gid = ctx->gid; ctx->security.gid = ctx->gid;
@ -4241,7 +4263,8 @@ int main(int argc, char *argv[])
if (failed_secure) if (failed_secure)
ntfs_log_info("%s\n",failed_secure); ntfs_log_info("%s\n",failed_secure);
if (permissions_mode) if (permissions_mode)
ntfs_log_info("%s\n",permissions_mode); ntfs_log_info("%s, configuration type %d\n",permissions_mode,
4 + POSIXACLS*6 - KERNELPERMS*3 + CACHEING);
fuse_loop(fh); fuse_loop(fh);