s3-smbd: Call sys_acl_free_qualifier() directly rather than via the VFS
authorAndrew Bartlett <abartlet@samba.org>
Mon, 13 Aug 2012 09:53:41 +0000 (19:53 +1000)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 15 Aug 2012 01:44:47 +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/trans2.c

index a25f1e16d8fddea08c92eaffe40de985f70e5585..c7bf4d0e2c8012f6ab8c43d4ec7dd15b71048726 100644 (file)
@@ -3899,7 +3899,7 @@ static bool marshall_posix_acl(connection_struct *conn, char *pdata, SMB_STRUCT_
                                                return False;
                                        }
                                        own_grp = (unsigned int)*puid;
-                                       SMB_VFS_SYS_ACL_FREE_QUALIFIER(conn, (void *)puid,tagtype);
+                                       sys_acl_free_qualifier((void*)puid,tagtype);
                                        SCVAL(pdata,0,SMB_POSIX_ACL_USER);
                                        SIVAL(pdata,2,own_grp);
                                        SIVAL(pdata,6,0);
@@ -3919,7 +3919,7 @@ static bool marshall_posix_acl(connection_struct *conn, char *pdata, SMB_STRUCT_
                                                return False;
                                        }
                                        own_grp = (unsigned int)*pgid;
-                                       SMB_VFS_SYS_ACL_FREE_QUALIFIER(conn, (void *)pgid,tagtype);
+                                       sys_acl_free_qualifier((void *)pgid,tagtype);
                                        SCVAL(pdata,0,SMB_POSIX_ACL_GROUP);
                                        SIVAL(pdata,2,own_grp);
                                        SIVAL(pdata,6,0);