s3: Fix the vfs_solarisacl module to compile.
authorIra Cooper <ira@samba.org>
Fri, 14 Sep 2012 01:32:45 +0000 (01:32 +0000)
committerIra Cooper <ira@samba.org>
Fri, 14 Sep 2012 03:21:29 +0000 (05:21 +0200)
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

source3/modules/vfs_solarisacl.c

index ff9f1a62e33c405d40195096e8ed73f7ad805f10..10b6f707d7941c28cde84d573858844e8fb7e1dc 100644 (file)
@@ -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;
        }