[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-224-g1de05f1

[Jeremy Allison]

The branch, v3-2-test has been updated
       via  1de05f1a87fcea598021ca485d3ed87005a3be68 (commit)
       via  c4fa4917dad97c5047f7336c6675739b44da256b (commit)
      from  c765090871ed68a9ba650bca44f5f3b88997ea14 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 1de05f1a87fcea598021ca485d3ed87005a3be68
Merge: c4fa4917dad97c5047f7336c6675739b44da256b c765090871ed68a9ba650bca44f5f3b88997ea14
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Mar 11 15:26:22 2008 -0700

    Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test

commit c4fa4917dad97c5047f7336c6675739b44da256b
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Mar 11 15:26:02 2008 -0700

    Using Metze's S4 nttrans rename test, the nttrans rename
    behaves the same as the trans2 one.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source/smbd/nttrans.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/smbd/nttrans.c b/source/smbd/nttrans.c
index f67ddd3..bc93d19 100644
--- a/source/smbd/nttrans.c
+++ b/source/smbd/nttrans.c
@@ -1550,7 +1550,7 @@ static void call_nt_transact_rename(connection_struct *conn,
 			replace_if_exists,
 			False,
 			dest_has_wcard,
-			DELETE_ACCESS);
+			FILE_WRITE_ATTRIBUTES);
 
 	if (!NT_STATUS_IS_OK(status)) {
 		if (open_was_deferred(req->mid)) {


-- 
Samba Shared Repository