Remove can_access_file_acl(). We no longer need this duplicate code (hurrah!).

[kai/samba.git] / source3 / smbd / open.c

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index a1a247fca26436dafca63adb392d7cbed1347455..eb9f13e22c4e7c49192c7c9eb2a3a549a0978996 100644 (file)
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -3266,7 +3266,9 @@ static NTSTATUS create_file_unixpath(connection_struct *conn,
        if ((create_disposition != FILE_CREATE)
            && (access_mask & DELETE_ACCESS)
            && (!(can_delete_file_in_directory(conn, smb_fname) ||
-                can_access_file_acl(conn, smb_fname, DELETE_ACCESS)))) {
+                NT_STATUS_IS_OK(smbd_check_access_rights(conn,
+                               smb_fname,
+                               DELETE_ACCESS))))) {
                status = NT_STATUS_ACCESS_DENIED;
                DEBUG(10,("create_file_unixpath: open file %s "
                          "for delete ACCESS_DENIED\n",