diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-08-13 19:55:25 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-08-15 11:44:47 +1000 |
| commit | 8b3227eb451b360a82d488c643e1e4e4ac96e2fc (patch) | |
| tree | 4bc09b74fae8b6a81a6b5c8b5596ebba7588e1c3 /source3/smbd/trans2.c | |
| parent | 6a46fbb393559be0d80d7b80a1391fbed52bcce0 (diff) | |
| download | samba-8b3227eb451b360a82d488c643e1e4e4ac96e2fc.tar.gz samba-8b3227eb451b360a82d488c643e1e4e4ac96e2fc.tar.bz2 samba-8b3227eb451b360a82d488c643e1e4e4ac96e2fc.zip | |
s3-smbd: Call sys_acl_free_acl() directly rather than via the VFS
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
Diffstat (limited to 'source3/smbd/trans2.c')
| -rw-r--r-- | source3/smbd/trans2.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c index c7bf4d0e2c..a178ec5b08 100644 --- a/source3/smbd/trans2.c +++ b/source3/smbd/trans2.c @@ -4914,10 +4914,10 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn, (unsigned int)((num_file_acls + num_def_acls)*SMB_POSIX_ACL_ENTRY_SIZE + SMB_POSIX_ACL_HEADER_SIZE) )); if (file_acl) { - SMB_VFS_SYS_ACL_FREE_ACL(conn, file_acl); + sys_acl_free_acl(file_acl); } if (def_acl) { - SMB_VFS_SYS_ACL_FREE_ACL(conn, def_acl); + sys_acl_free_acl(def_acl); } return NT_STATUS_BUFFER_TOO_SMALL; } @@ -4927,28 +4927,28 @@ NTSTATUS smbd_do_qfilepathinfo(connection_struct *conn, SSVAL(pdata,4,num_def_acls); if (!marshall_posix_acl(conn, pdata + SMB_POSIX_ACL_HEADER_SIZE, psbuf, file_acl)) { if (file_acl) { - SMB_VFS_SYS_ACL_FREE_ACL(conn, file_acl); + sys_acl_free_acl(file_acl); } if (def_acl) { - SMB_VFS_SYS_ACL_FREE_ACL(conn, def_acl); + sys_acl_free_acl(def_acl); } return NT_STATUS_INTERNAL_ERROR; } if (!marshall_posix_acl(conn, pdata + SMB_POSIX_ACL_HEADER_SIZE + (num_file_acls*SMB_POSIX_ACL_ENTRY_SIZE), psbuf, def_acl)) { if (file_acl) { - SMB_VFS_SYS_ACL_FREE_ACL(conn, file_acl); + sys_acl_free_acl(file_acl); } if (def_acl) { - SMB_VFS_SYS_ACL_FREE_ACL(conn, def_acl); + sys_acl_free_acl(def_acl); } return NT_STATUS_INTERNAL_ERROR; } if (file_acl) { - SMB_VFS_SYS_ACL_FREE_ACL(conn, file_acl); + sys_acl_free_acl(file_acl); } if (def_acl) { - SMB_VFS_SYS_ACL_FREE_ACL(conn, def_acl); + sys_acl_free_acl(def_acl); } data_size = (num_file_acls + num_def_acls)*SMB_POSIX_ACL_ENTRY_SIZE + SMB_POSIX_ACL_HEADER_SIZE; break; |