summaryrefslogtreecommitdiff
path: root/source3/modules
diff options
context:
space:
mode:
authorIra Cooper <ira@samba.org>2012-09-14 01:32:45 +0000
committerIra Cooper <ira@samba.org>2012-09-14 05:21:29 +0200
commit5e51f63e86ab0855daf9e822d48a12134bfb6f26 (patch)
tree3981e911e6387ec61d37d2d7143aede947a009ac /source3/modules
parent88a5bff88917d7e3013ced7e85d56a8ecdfeece4 (diff)
downloadsamba-5e51f63e86ab0855daf9e822d48a12134bfb6f26.tar.gz
samba-5e51f63e86ab0855daf9e822d48a12134bfb6f26.tar.bz2
samba-5e51f63e86ab0855daf9e822d48a12134bfb6f26.zip
s3: Fix the vfs_solarisacl module to compile.
This got broken with the recent VFS acl structure changes. Autobuild-User(master): Ira Cooper <ira@samba.org> Autobuild-Date(master): Fri Sep 14 05:21:29 CEST 2012 on sn-devel-104
Diffstat (limited to 'source3/modules')
-rw-r--r--source3/modules/vfs_solarisacl.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/modules/vfs_solarisacl.c b/source3/modules/vfs_solarisacl.c
index ff9f1a62e3..10b6f707d7 100644
--- a/source3/modules/vfs_solarisacl.c
+++ b/source3/modules/vfs_solarisacl.c
@@ -370,13 +370,13 @@ static bool smb_acl_to_solaris_acl(SMB_ACL_T smb_acl,
switch(solaris_entry.a_type) {
case USER:
DEBUG(10, ("got tag type USER with uid %u\n",
- (unsigned int)smb_entry->uid));
- solaris_entry.a_id = (uid_t)smb_entry->uid;
+ (unsigned int)smb_entry->info.user.uid));
+ solaris_entry.a_id = (uid_t)smb_entry->info.user.uid;
break;
case GROUP:
DEBUG(10, ("got tag type GROUP with gid %u\n",
- (unsigned int)smb_entry->gid));
- solaris_entry.a_id = (uid_t)smb_entry->gid;
+ (unsigned int)smb_entry->info.group.gid));
+ solaris_entry.a_id = (uid_t)smb_entry->info.group.gid;
break;
default:
break;
@@ -429,7 +429,7 @@ static SMB_ACL_T solaris_acl_to_smb_acl(SOLARIS_ACL_T solaris_acl, int count,
SMB_ACL_T result;
int i;
- if ((result = sys_acl_init(0)) == NULL) {
+ if ((result = sys_acl_init()) == NULL) {
DEBUG(10, ("error allocating memory for SMB_ACL\n"));
goto fail;
}