[SCM] Samba Shared Repository - branch master updated

Jeremy Allison jra at samba.org
Wed Dec 23 09:38:03 UTC 2015


The branch, master has been updated
       via  431cf20 s3: smbd: open_file: use FSP_POSIX_FLAGS_PATHNAMES
       via  58bebcb smbd: file_struct: factor out POSIX pathname processing out of POSIX open
      from  035bd5f s3: smbd: Remove lp_posix_pathnames() from filename.c

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


- Log -----------------------------------------------------------------
commit 431cf20160b9c5db524441055a2a67b668374707
Author: Jeremy Allison <jra at samba.org>
Date:   Fri Dec 11 14:49:44 2015 -0800

    s3: smbd: open_file: use FSP_POSIX_FLAGS_PATHNAMES
    
    Start using FSP_POSIX_FLAGS_PATHNAMES instead of the kitchen sink
    FSP_POSIX_FLAGS_OPEN.
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>
    
    Autobuild-User(master): Jeremy Allison <jra at samba.org>
    Autobuild-Date(master): Wed Dec 23 10:37:07 CET 2015 on sn-devel-144

commit 58bebcb4bc9b88c2229be0676e1d63597accca52
Author: Ralph Boehme <slow at samba.org>
Date:   Sat Dec 12 22:31:24 2015 +0100

    smbd: file_struct: factor out POSIX pathname processing out of POSIX open
    
    Factor out another POSIX cabability from file_struct.posix_flags
    FSP_POSIX_FLAGS_OPEN.
    
    Places that still use FSP_POSIX_FLAGS_OPEN when dealing with pathnames
    can be converted later, because for the time being we always set
    FSP_POSIX_FLAGS_ALL in file_struct.posix_flags.
    
    Signed-off-by: Ralph Boehme <slow at samba.org>
    Reviewed-by: Jeremy Allison <jra at samba.org>

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

Summary of changes:
 source3/include/vfs.h | 2 ++
 source3/smbd/open.c   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index 17bd8fa..71e1af9 100644
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -301,9 +301,11 @@ typedef struct files_struct {
 
 #define FSP_POSIX_FLAGS_OPEN		0x01
 #define FSP_POSIX_FLAGS_RENAME		0x02
+#define FSP_POSIX_FLAGS_PATHNAMES	0x04
 
 #define FSP_POSIX_FLAGS_ALL			\
 	(FSP_POSIX_FLAGS_OPEN |			\
+	 FSP_POSIX_FLAGS_PATHNAMES |		\
 	 FSP_POSIX_FLAGS_RENAME)
 
 struct vuid_cache_entry {
diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index d728782..d4f257c 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -809,7 +809,7 @@ static NTSTATUS open_file(files_struct *fsp,
 			wild = smb_fname->base_name;
 		}
 		if ((local_flags & O_CREAT) && !file_existed &&
-		    !(fsp->posix_flags & FSP_POSIX_FLAGS_OPEN) &&
+		    !(fsp->posix_flags & FSP_POSIX_FLAGS_PATHNAMES) &&
 		    ms_has_wild(wild))  {
 			return NT_STATUS_OBJECT_NAME_INVALID;
 		}


-- 
Samba Shared Repository



More information about the samba-cvs mailing list