1
0
mirror of https://github.com/samba-team/samba.git synced 2025-02-26 21:57:41 +03:00

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
This commit is contained in:
Ira Cooper 2012-09-14 01:32:45 +00:00
parent 88a5bff889
commit 5e51f63e86

View File

@ -370,13 +370,13 @@ static bool smb_acl_to_solaris_acl(SMB_ACL_T smb_acl,
switch(solaris_entry.a_type) { switch(solaris_entry.a_type) {
case USER: case USER:
DEBUG(10, ("got tag type USER with uid %u\n", DEBUG(10, ("got tag type USER with uid %u\n",
(unsigned int)smb_entry->uid)); (unsigned int)smb_entry->info.user.uid));
solaris_entry.a_id = (uid_t)smb_entry->uid; solaris_entry.a_id = (uid_t)smb_entry->info.user.uid;
break; break;
case GROUP: case GROUP:
DEBUG(10, ("got tag type GROUP with gid %u\n", DEBUG(10, ("got tag type GROUP with gid %u\n",
(unsigned int)smb_entry->gid)); (unsigned int)smb_entry->info.group.gid));
solaris_entry.a_id = (uid_t)smb_entry->gid; solaris_entry.a_id = (uid_t)smb_entry->info.group.gid;
break; break;
default: default:
break; 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; SMB_ACL_T result;
int i; int i;
if ((result = sys_acl_init(0)) == NULL) { if ((result = sys_acl_init()) == NULL) {
DEBUG(10, ("error allocating memory for SMB_ACL\n")); DEBUG(10, ("error allocating memory for SMB_ACL\n"));
goto fail; goto fail;
} }