[SCM] Samba Shared Repository - branch master updated

[Ralph Böhme]

The branch, master has been updated
       via  cff17f0 s3: smbd: Remove one more use of lp_posix_pathnames().
      from  ecc7022 s3-util: skip S-1-18 sids in token generaion in sid_array_from_info3().

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit cff17f0a8ccf697d2836fe5b32b621995a9fc432
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Jan 15 16:22:26 2016 -0800

    s3: smbd: Remove one more use of lp_posix_pathnames().
    
    Slowly removing them...
    
    Signed-off-by: Jeremy Allison <jra at samba.org>
    Reviewed-by: Ralph Boehme <slow at samba.org>
    
    Autobuild-User(master): Ralph Böhme <slow at samba.org>
    Autobuild-Date(master): Sun Jan 17 02:07:23 CET 2016 on sn-devel-144

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

Summary of changes:
 source3/smbd/dir.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/dir.c b/source3/smbd/dir.c
index a322bb5..3805915 100644
--- a/source3/smbd/dir.c
+++ b/source3/smbd/dir.c
@@ -2036,7 +2036,7 @@ NTSTATUS can_delete_directory_fsp(files_struct *fsp)
 		return status;
 	}
 
-	if (!lp_posix_pathnames() &&
+	if (!(fsp->posix_flags & FSP_POSIX_FLAGS_RENAME) &&
 	    lp_strict_rename(SNUM(conn)) &&
 	    have_file_open_below(fsp->conn, fsp->fsp_name))
 	{


-- 
Samba Shared Repository