The branch, v3-2-test has been updated via 5d1d650d192d4782421b5c3c2be1b632d4318279 (commit) from c15819b75751a1e15cfed2ef94dae10ee72d769c (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test - Log ----------------------------------------------------------------- commit 5d1d650d192d4782421b5c3c2be1b632d4318279 Author: Jeremy Allison <[EMAIL PROTECTED]> Date: Mon Nov 12 11:39:35 2007 -0800 Fix bug #5073. Allow "delete readonly = yes" to correctly override deletion of a file. Fix from David Shaw <[EMAIL PROTECTED]> Jeremy. ----------------------------------------------------------------------- Summary of changes: source/smbd/nttrans.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) Changeset truncated at 500 lines: diff --git a/source/smbd/nttrans.c b/source/smbd/nttrans.c index 4bd4571..f07d64e 100644 --- a/source/smbd/nttrans.c +++ b/source/smbd/nttrans.c @@ -788,7 +788,8 @@ void reply_ntcreate_and_X(connection_struct *conn, && (create_disposition != FILE_CREATE) && (share_access & FILE_SHARE_DELETE) && (access_mask & DELETE_ACCESS)) { - if ((dos_mode(conn, fname, &sbuf) & FILE_ATTRIBUTE_READONLY) || + if (((dos_mode(conn, fname, &sbuf) & FILE_ATTRIBUTE_READONLY) + && !lp_delete_readonly(SNUM(conn))) || !can_delete_file_in_directory(conn, fname)) { TALLOC_FREE(case_state); reply_nterror(req, NT_STATUS_ACCESS_DENIED); -- Samba Shared Repository