diff options
| author | Jeremy Allison <jra@samba.org> | 2011-11-04 15:55:11 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2011-11-04 15:55:11 -0700 |
| commit | b988a3233fae309c6f034724ae106d935b1489f7 (patch) | |
| tree | eabc21bdd9ec860752f5e163ab2e64d8dbad478c /source3/smbd/open.c | |
| parent | 60b741415d9357f11ae1db80f93035058fdbe4e8 (diff) | |
| download | samba-b988a3233fae309c6f034724ae106d935b1489f7.tar.gz samba-b988a3233fae309c6f034724ae106d935b1489f7.tar.bz2 samba-b988a3233fae309c6f034724ae106d935b1489f7.zip | |
Remove can_access_file_acl(). We no longer need this duplicate code (hurrah!).
Diffstat (limited to 'source3/smbd/open.c')
| -rw-r--r-- | source3/smbd/open.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source3/smbd/open.c b/source3/smbd/open.c index a1a247fca2..eb9f13e22c 100644 --- 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", |