s3: fix the hpux acl module
authorBjörn Jacke <bj@sernet.de>
Fri, 14 Sep 2012 08:01:33 +0000 (10:01 +0200)
committerBjoern Jacke <bj@sernet.de>
Fri, 14 Sep 2012 10:23:23 +0000 (12:23 +0200)
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

source3/modules/vfs_hpuxacl.c

index f8661b1134ca00c441752a46371e0d224f78d320..884cc5c6f6a8add9ea8f51e18fee1462190c8d44 100644 (file)
@@ -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;
        }