s3-smbd: Call sys_acl_free_qualifier() directly rather than via the VFS
authorAndrew Bartlett <abartlet@samba.org>
Mon, 13 Aug 2012 09:47:16 +0000 (19:47 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 15 Aug 2012 01:44:46 +0000 (11:44 +1000)
This will allow us to remove the struct smb_acl_t manipuations from the VFS layer,
which will be reduced to handling the get/set functions.

Andrew Bartlett

source3/smbd/posix_acls.c

index b369582987133e17e827bf5169b4a513b48de078..e63f8b7e93a0d1af6cac409e0051140efa879682 100644 (file)
@@ -2667,7 +2667,7 @@ static canon_ace *canonicalise_acl(struct connection_struct *conn,
                                        unix_ug.type = ID_TYPE_UID;
                                        unix_ug.id = *puid;
                                        owner_type = UID_ACE;
-                                       SMB_VFS_SYS_ACL_FREE_QUALIFIER(conn, (void *)puid,tagtype);
+                                       sys_acl_free_qualifier((void *)puid,tagtype);
                                        break;
                                }
                        case SMB_ACL_GROUP_OBJ:
@@ -2688,7 +2688,7 @@ static canon_ace *canonicalise_acl(struct connection_struct *conn,
                                        unix_ug.type = ID_TYPE_GID;
                                        unix_ug.id = *pgid;
                                        owner_type = GID_ACE;
-                                       SMB_VFS_SYS_ACL_FREE_QUALIFIER(conn, (void *)pgid,tagtype);
+                                       sys_acl_free_qualifier((void *)pgid,tagtype);
                                        break;
                                }
                        case SMB_ACL_MASK: