diff options
| author | Christian Ambach <ambi@samba.org> | 2012-09-15 22:57:51 +0200 |
|---|---|---|
| committer | Christian Ambach <ambi@samba.org> | 2012-09-16 11:50:12 -0700 |
| commit | 7a6182962966e5edb42728c8d0a4d471a69c83d7 (patch) | |
| tree | a20cc835483d108ed5b3b036a0c36db44cda0fe7 | |
| parent | 99b5c75974dd904644054433a3c3ad46a4ffc498 (diff) | |
| download | samba-7a6182962966e5edb42728c8d0a4d471a69c83d7.tar.gz samba-7a6182962966e5edb42728c8d0a4d471a69c83d7.tar.bz2 samba-7a6182962966e5edb42728c8d0a4d471a69c83d7.zip | |
s3:vfs_gpfs: fix build
after recent VFS changes
| -rw-r--r-- | source3/modules/vfs_gpfs.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/modules/vfs_gpfs.c b/source3/modules/vfs_gpfs.c index a39187e487..8959fe6056 100644 --- a/source3/modules/vfs_gpfs.c +++ b/source3/modules/vfs_gpfs.c @@ -554,7 +554,7 @@ static SMB_ACL_T gpfs2smb_acl(const struct gpfs_acl *pacl) SMB_ACL_T result; gpfs_aclCount_t i; - result = sys_acl_init(pacl->acl_nace); + result = sys_acl_init(); if (result == NULL) { errno = ENOMEM; return NULL; @@ -573,14 +573,14 @@ static SMB_ACL_T gpfs2smb_acl(const struct gpfs_acl *pacl) switch (g_ace->ace_type) { case GPFS_ACL_USER: ace->a_type = SMB_ACL_USER; - ace->uid = (uid_t)g_ace->ace_who; + ace->info.user.uid = (uid_t)g_ace->ace_who; break; case GPFS_ACL_USER_OBJ: ace->a_type = SMB_ACL_USER_OBJ; break; case GPFS_ACL_GROUP: ace->a_type = SMB_ACL_GROUP; - ace->gid = (gid_t)g_ace->ace_who; + ace->info.group.gid = (gid_t)g_ace->ace_who; break; case GPFS_ACL_GROUP_OBJ: ace->a_type = SMB_ACL_GROUP_OBJ; @@ -738,7 +738,7 @@ static struct gpfs_acl *smb2gpfs_acl(const SMB_ACL_T pacl, switch(ace->a_type) { case SMB_ACL_USER: g_ace->ace_type = GPFS_ACL_USER; - g_ace->ace_who = (gpfs_uid_t)ace->uid; + g_ace->ace_who = (gpfs_uid_t)ace->info.user.uid; break; case SMB_ACL_USER_OBJ: g_ace->ace_type = GPFS_ACL_USER_OBJ; @@ -747,7 +747,7 @@ static struct gpfs_acl *smb2gpfs_acl(const SMB_ACL_T pacl, break; case SMB_ACL_GROUP: g_ace->ace_type = GPFS_ACL_GROUP; - g_ace->ace_who = (gpfs_uid_t)ace->gid; + g_ace->ace_who = (gpfs_uid_t)ace->info.group.gid; break; case SMB_ACL_GROUP_OBJ: g_ace->ace_type = GPFS_ACL_GROUP_OBJ; |