[SCM] Samba Shared Repository - branch v3-6-test updated

[Karolin Seeger]

The branch, v3-6-test has been updated
       via  6603013 Fix bug #9587 - archive flag is always set on directories.
      from  ae0cf58 BUG 9474: Downgrade v4 printer driver requests to v3.

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


- Log -----------------------------------------------------------------
commit 6603013f8f03773d141c33fd1c4923197a5350c8
Author: Jeremy Allison <jra at samba.org>
Date:   Thu Jan 24 11:02:30 2013 -0800

    Fix bug #9587 - archive flag is always set on directories.
    
    Creating a directory to a Samba share sets the attributes to 'D' only
    (correct) - only when creating a new file should the 'A' attribute
    be set.
    
    However, doing a rename of that directory sets the 'A' attribute in error.
    This should only be done on a file rename. smbclient regression test to follow.
    
    Signed-off-by: Jeremy Allison <jra at samba.org>

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

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


Changeset truncated at 500 lines:

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index ac471aa..a708fd8 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -6187,7 +6187,8 @@ NTSTATUS rename_internals_fsp(connection_struct *conn,
 			  "%s -> %s\n", smb_fname_str_dbg(fsp->fsp_name),
 			  smb_fname_str_dbg(smb_fname_dst)));
 
-		if (!lp_posix_pathnames() &&
+		if (!fsp->is_directory &&
+		    !lp_posix_pathnames() &&
 		    (lp_map_archive(SNUM(conn)) ||
 		    lp_store_dos_attributes(SNUM(conn)))) {
 			/* We must set the archive bit on the newly


-- 
Samba Shared Repository