diff options
| author | Tim Prouty <tprouty@samba.org> | 2008-12-30 17:17:24 -0800 |
|---|---|---|
| committer | Tim Prouty <tprouty@samba.org> | 2009-01-11 22:13:36 -0800 |
| commit | 5c48ba6563ff025037b9337d34b9aa13de610fba (patch) | |
| tree | e24789f5a1f0ed1fad8fe76b072148c23661be01 /source3/modules/onefs_open.c | |
| parent | ce5eded7e03d86d5d7f2ee1a9d975fae116d2306 (diff) | |
| download | samba-5c48ba6563ff025037b9337d34b9aa13de610fba.tar.gz samba-5c48ba6563ff025037b9337d34b9aa13de610fba.tar.bz2 samba-5c48ba6563ff025037b9337d34b9aa13de610fba.zip | |
s3: General cleanup of the open path in the OneFS vfs module
Diffstat (limited to 'source3/modules/onefs_open.c')
| -rw-r--r-- | source3/modules/onefs_open.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/source3/modules/onefs_open.c b/source3/modules/onefs_open.c index a86d39948d..df0b75df95 100644 --- a/source3/modules/onefs_open.c +++ b/source3/modules/onefs_open.c @@ -575,8 +575,6 @@ NTSTATUS onefs_open_file_ntcreate(connection_struct *conn, * (requiring delete access) then recreates it. */ case FILE_SUPERSEDE: - /* If file exists replace/overwrite. If file doesn't - * exist create. */ /** * @todo: Clear all file attributes? * http://www.osronline.com/article.cfm?article=302 @@ -748,19 +746,8 @@ NTSTATUS onefs_open_file_ntcreate(connection_struct *conn, */ flags2 &= ~(O_CREAT|O_TRUNC); - /** - * XXX: TODO - * Apparently this is necessary because we ship with - * lp_acl_check_permissions = no. It is set to no because our - * ifs_createfile does the access check correctly. This check - * was added in the last merge, and the question is why is it - * necessary? Check out Bug 25547 and Bug 14596. The key is - * to figure out what case this is covering, and do some - * testing to see if it's actually necessary. If it is, maybe - * it should go upstream in open.c. - */ - if (!lp_acl_check_permissions(SNUM(conn)) && - (access_mask & DELETE_ACCESS)) { + /* Deny DELETE_ACCESS explicitly if the share is read only. */ + if (access_mask & DELETE_ACCESS) { return map_nt_error_from_unix(EACCES); } } |