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

Fixed a stupid name prefixing

N2009_11_14_FIXES
jpandre 2008-08-30 10:31:40 +00:00
parent 6d484cd842
commit 6bfd3ed546
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -171,7 +171,7 @@ struct POSIX_SECURITY *ntfs_build_inherited_posix(
const struct POSIX_SECURITY *pxdesc, mode_t mode, BOOL isdir);
struct POSIX_SECURITY *ntfs_replace_acl(const struct POSIX_SECURITY *oldpxdesc,
const struct POSIX_ACL *newacl, int count, BOOL deflt);
struct POSIX_SECURITY *ntfs_ntfs_build_permissions_posix(struct MAPPING *mapping[],
struct POSIX_SECURITY *ntfs_build_permissions_posix(struct MAPPING *mapping[],
const char *securattr,
const SID *usid, const SID *gsid, ntfs_inode *ni);
struct POSIX_SECURITY *ntfs_merge_descr_posix(const struct POSIX_SECURITY *first,

2
libntfs-3g/acls.c
View File

@ -3220,7 +3220,7 @@ static uid_t find_tenant(struct MAPPING *mapping[],
* be a a poor approximation of what was expected
*/
struct POSIX_SECURITY *ntfs_ntfs_build_permissions_posix(struct MAPPING *mapping[],
struct POSIX_SECURITY *ntfs_build_permissions_posix(struct MAPPING *mapping[],
const char *securattr,
const SID *usid, const SID *gsid, ntfs_inode *ni)
{

18
libntfs-3g/security.c
View File

@ -1923,7 +1923,7 @@ static int ntfs_get_perm(struct SECURITY_CONTEXT *scx,
gid = ntfs_find_group(scx->mapping[MAPGROUPS],gsid);
#if OWNERFROMACL
usid = ntfs_acl_owner(securattr);
pxdesc = ntfs_ntfs_build_permissions_posix(scx->mapping,securattr,
pxdesc = ntfs_build_permissions_posix(scx->mapping,securattr,
usid, gsid, ni);
if (pxdesc)
perm = pxdesc->mode & 07777;
@ -1933,7 +1933,7 @@ static int ntfs_get_perm(struct SECURITY_CONTEXT *scx,
#else
usid = (const SID*)&
securattr[le32_to_cpu(phead->owner)];
pxdesc = ntfs_ntfs_build_permissions_posix(scx,securattr,
pxdesc = ntfs_build_permissions_posix(scx,securattr,
usid, gsid, ni);
if (pxdesc)
perm = pxdesc->mode & 07777;
@ -2022,7 +2022,7 @@ int ntfs_get_posix_acl(struct SECURITY_CONTEXT *scx, const char *path,
usid = (const SID*)&
securattr[le32_to_cpu(phead->owner)];
#endif
pxdesc = ntfs_ntfs_build_permissions_posix(scx->mapping,securattr,
pxdesc = ntfs_build_permissions_posix(scx->mapping,securattr,
usid, gsid, ni);
/*
@ -2145,7 +2145,7 @@ int ntfs_get_owner_mode(struct SECURITY_CONTEXT *scx,
securattr[le32_to_cpu(phead->owner)];
#endif
#if POSIXACLS
pxdesc = ntfs_ntfs_build_permissions_posix(scx->mapping, securattr,
pxdesc = ntfs_build_permissions_posix(scx->mapping, securattr,
usid, gsid, ni);
if (pxdesc)
perm = pxdesc->mode & 07777;
@ -2241,13 +2241,13 @@ static struct POSIX_SECURITY *inherit_posix(struct SECURITY_CONTEXT *scx,
gid = ntfs_find_group(scx->mapping[MAPGROUPS],gsid);
#if OWNERFROMACL
usid = ntfs_acl_owner(securattr);
pxdesc = ntfs_ntfs_build_permissions_posix(scx->mapping,securattr,
pxdesc = ntfs_build_permissions_posix(scx->mapping,securattr,
usid, gsid, dir_ni);
uid = ntfs_find_user(scx->mapping[MAPUSERS],usid);
#else
usid = (const SID*)&
securattr[le32_to_cpu(phead->owner)];
pxdesc = ntfs_ntfs_build_permissions_posix(scx->mapping,securattr,
pxdesc = ntfs_build_permissions_posix(scx->mapping,securattr,
usid, gsid, dir_ni);
if (pxdesc && ntfs_same_sid(usid, adminsid)) {
uid = find_tenant(scx, securattr);
@ -2679,7 +2679,7 @@ int ntfs_set_posix_acl(struct SECURITY_CONTEXT *scx, const char *path,
gsid = (const SID*)&oldattr[le32_to_cpu(phead->group)];
uid = ntfs_find_user(scx->mapping[MAPUSERS],usid);
gid = ntfs_find_group(scx->mapping[MAPGROUPS],gsid);
oldpxdesc = ntfs_ntfs_build_permissions_posix(scx->mapping,
oldpxdesc = ntfs_build_permissions_posix(scx->mapping,
oldattr, usid, gsid, ni);
if (oldpxdesc) {
mode = oldpxdesc->mode;
@ -2792,7 +2792,7 @@ int ntfs_set_mode(struct SECURITY_CONTEXT *scx,
gid = ntfs_find_group(scx->mapping[MAPGROUPS],gsid);
#if POSIXACLS
isdir = (ni->mrec->flags & MFT_RECORD_IS_DIRECTORY) != const_cpu_to_le16(0);
newpxdesc = ntfs_ntfs_build_permissions_posix(scx->mapping,
newpxdesc = ntfs_build_permissions_posix(scx->mapping,
oldattr, usid, gsid, ni);
if (!newpxdesc || ntfs_merge_mode_posix(newpxdesc, mode))
res = -1;
@ -3103,7 +3103,7 @@ int ntfs_set_owner(struct SECURITY_CONTEXT *scx,
&oldattr[le32_to_cpu(phead->owner)];
#endif
#if POSIXACLS
pxdesc = ntfs_ntfs_build_permissions_posix(scx->mapping, oldattr,
pxdesc = ntfs_build_permissions_posix(scx->mapping, oldattr,
usid, gsid, ni);
if (pxdesc) {
pxdescbuilt = TRUE;