summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Jacke <bj@sernet.de>2012-09-14 10:01:33 +0200
committerBjoern Jacke <bj@sernet.de>2012-09-14 12:23:23 +0200
commit1aa281ecb0f45c97d78161fd1308be8655295f1f (patch)
tree921f391fb451fb3692ffeeb9dfae160b6996dc66
parent9222f0f9280485c2751ecfdb96421da25e6e5344 (diff)
downloadsamba-1aa281ecb0f45c97d78161fd1308be8655295f1f.tar.gz
samba-1aa281ecb0f45c97d78161fd1308be8655295f1f.tar.bz2
samba-1aa281ecb0f45c97d78161fd1308be8655295f1f.zip
s3: fix the hpux acl module
This was not adopted to the recent VFS acl structure changes. Autobuild-User(master): Björn Jacke <bj@sernet.de> Autobuild-Date(master): Fri Sep 14 12:23:23 CEST 2012 on sn-devel-104
-rw-r--r--source3/modules/vfs_hpuxacl.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/modules/vfs_hpuxacl.c b/source3/modules/vfs_hpuxacl.c
index f8661b1134..884cc5c6f6 100644
--- a/source3/modules/vfs_hpuxacl.c
+++ b/source3/modules/vfs_hpuxacl.c
@@ -436,13 +436,13 @@ static bool smb_acl_to_hpux_acl(SMB_ACL_T smb_acl,
switch(hpux_entry.a_type) {
case USER:
DEBUG(10, ("got tag type USER with uid %d\n",
- smb_entry->uid));
- hpux_entry.a_id = (uid_t)smb_entry->uid;
+ smb_entry->info.user.uid));
+ hpux_entry.a_id = (uid_t)smb_entry->info.user.uid;
break;
case GROUP:
DEBUG(10, ("got tag type GROUP with gid %d\n",
- smb_entry->gid));
- hpux_entry.a_id = (uid_t)smb_entry->gid;
+ smb_entry->info.group.gid));
+ hpux_entry.a_id = (uid_t)smb_entry->info.group.gid;
break;
default:
break;
@@ -495,7 +495,7 @@ static SMB_ACL_T hpux_acl_to_smb_acl(HPUX_ACL_T hpux_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;
}