[SCM] Samba Shared Repository - branch master updated - 936037c7dabab1654d4d5e398b2a6ef2d640fc17

[Jeremy Allison]

The branch, master has been updated
       via  936037c7dabab1654d4d5e398b2a6ef2d640fc17 (commit)
      from  edde763d3f981f9ccdf65feffd85a591fb1708c1 (commit)

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


- Log -----------------------------------------------------------------
commit 936037c7dabab1654d4d5e398b2a6ef2d640fc17
Author: Stefan Metzmacher <metze at samba.org>
Date:   Mon Dec 1 13:27:47 2008 -0800

    s3:smbd: wildcard characters are allowed in stream names
    
    We only check the filename of the basefile now.
    
    metze

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

Summary of changes:
 source3/smbd/open.c |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/smbd/open.c b/source3/smbd/open.c
index a6867e0..a8cc5c9 100644
--- a/source3/smbd/open.c
+++ b/source3/smbd/open.c
@@ -332,6 +332,7 @@ static NTSTATUS open_file(files_struct *fsp,
 	if ((open_access_mask & (FILE_READ_DATA|FILE_WRITE_DATA|FILE_APPEND_DATA|FILE_EXECUTE)) ||
 	    (!file_existed && (local_flags & O_CREAT)) ||
 	    ((local_flags & O_TRUNC) == O_TRUNC) ) {
+		const char *wild;
 
 		/*
 		 * We can't actually truncate here as the file may be locked.
@@ -353,8 +354,17 @@ static NTSTATUS open_file(files_struct *fsp,
 #endif
 
 		/* Don't create files with Microsoft wildcard characters. */
+		if (fsp->base_fsp) {
+			/*
+			 * wildcard characters are allowed in stream names
+			 * only test the basefilename
+			 */
+			wild = fsp->base_fsp->fsp_name;
+		} else {
+			wild = path;
+		}
 		if ((local_flags & O_CREAT) && !file_existed &&
-		    ms_has_wild(path))  {
+		    ms_has_wild(wild))  {
 			return NT_STATUS_OBJECT_NAME_INVALID;
 		}
 


-- 
Samba Shared Repository