diff options
| author | Volker Lendecke <vlendec@samba.org> | 2007-01-02 12:10:46 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:16:51 -0500 |
| commit | 2c1b3a072061d40f112c3f1112fd9ae08b6038e4 (patch) | |
| tree | f6c1a43969289dd959aa49e058de0adb154d4f75 /source3/smbd/nttrans.c | |
| parent | 3c4342ddfbe95cfbc64902177d4955882f71a4a0 (diff) | |
| download | samba-2c1b3a072061d40f112c3f1112fd9ae08b6038e4.tar.gz samba-2c1b3a072061d40f112c3f1112fd9ae08b6038e4.tar.bz2 samba-2c1b3a072061d40f112c3f1112fd9ae08b6038e4.zip | |
r20470: Jeremy, another one to check:
The only error path of can_delete() that we're interested in ntcreate&x is the
one of can_delete_file_in_directory(), so call that directly.
The only other one where we might get a NT_STATUS_ACCESS_DENIED is from the
lstat in can_delete, but this is covered later in the open_directory and
open_file_ntcreate calls. open_directory does a stat() in the open case which
also covers the (potential) symlink, and open_file_ntcreate does the open(2)
itself, so this should also work.
This makes can_delete() static to reply.c.
Volker
(This used to be commit d289037fdbc8bd3e0723784888946d5b39ffadef)
Diffstat (limited to 'source3/smbd/nttrans.c')
| -rw-r--r-- | source3/smbd/nttrans.c | 39 |
1 files changed, 17 insertions, 22 deletions
diff --git a/source3/smbd/nttrans.c b/source3/smbd/nttrans.c index 5c96669987..faa3e25bae 100644 --- a/source3/smbd/nttrans.c +++ b/source3/smbd/nttrans.c @@ -647,21 +647,18 @@ int reply_ntcreate_and_X(connection_struct *conn, expensive (it may have to read the parent directory permissions). So for now we're not doing it unless we have a strong hint the client is really going to delete this file. */ - if (desired_access & DELETE_ACCESS) { + if ((desired_access & DELETE_ACCESS) + && !can_delete_file_in_directory(conn, fname)) { #else /* Setting FILE_SHARE_DELETE is the hint. */ - if (lp_acl_check_permissions(SNUM(conn)) && (share_access & FILE_SHARE_DELETE) - && (access_mask & DELETE_ACCESS)) { + if (lp_acl_check_permissions(SNUM(conn)) + && (share_access & FILE_SHARE_DELETE) + && (access_mask & DELETE_ACCESS) + && !can_delete_file_in_directory(conn, fname)) { #endif - status = can_delete(conn, fname, file_attributes, bad_path, True); - /* We're only going to fail here if it's access denied, as that's the - only error we care about for "can we delete this ?" questions. */ - if (NT_STATUS_EQUAL(status,NT_STATUS_ACCESS_DENIED) || - NT_STATUS_EQUAL(status,NT_STATUS_CANNOT_DELETE)) { - restore_case_semantics(conn, file_attributes); - END_PROFILE(SMBntcreateX); - return ERROR_NT(NT_STATUS_ACCESS_DENIED); - } + restore_case_semantics(conn, file_attributes); + END_PROFILE(SMBntcreateX); + return ERROR_NT(NT_STATUS_ACCESS_DENIED); } /* @@ -1276,19 +1273,17 @@ static int call_nt_transact_create(connection_struct *conn, char *inbuf, char *o expensive (it may have to read the parent directory permissions). So for now we're not doing it unless we have a strong hint the client is really going to delete this file. */ - if (desired_access & DELETE_ACCESS) { + if ((desired_access & DELETE_ACCESS) + && !can_delete_file_in_directory(conn, fname)) { #else /* Setting FILE_SHARE_DELETE is the hint. */ - if (lp_acl_check_permissions(SNUM(conn)) && (share_access & FILE_SHARE_DELETE) && (access_mask & DELETE_ACCESS)) { + if (lp_acl_check_permissions(SNUM(conn)) + && (share_access & FILE_SHARE_DELETE) + && (access_mask & DELETE_ACCESS) + && !can_delete_file_in_directory(conn, fname)) { #endif - status = can_delete(conn, fname, file_attributes, bad_path, True); - /* We're only going to fail here if it's access denied, as that's the - only error we care about for "can we delete this ?" questions. */ - if (NT_STATUS_EQUAL(status,NT_STATUS_ACCESS_DENIED) || - NT_STATUS_EQUAL(status,NT_STATUS_CANNOT_DELETE)) { - restore_case_semantics(conn, file_attributes); - return ERROR_NT(status); - } + restore_case_semantics(conn, file_attributes); + return ERROR_NT(NT_STATUS_ACCESS_DENIED); } if (ea_len) { |