[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-559-gadd8163

[Jeremy Allison]

The branch, master has been updated
       via  add8163c3b301ff153e7b492265fc2dc72784c7e (commit)
       via  a00a9e4e2cc30338b4b44109e384f16f5df76f0b (commit)
      from  d380c49791d1010d759369cab12d93b6fbd48dc7 (commit)

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


- Log -----------------------------------------------------------------
commit add8163c3b301ff153e7b492265fc2dc72784c7e
Merge: a00a9e4e2cc30338b4b44109e384f16f5df76f0b d380c49791d1010d759369cab12d93b6fbd48dc7
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Mar 18 20:02:26 2009 -0700

    Merge branch 'master' of ssh://jra@git.samba.org/data/git/samba

commit a00a9e4e2cc30338b4b44109e384f16f5df76f0b
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Mar 18 20:00:28 2009 -0700

    Fix bug #6196 - Unable to serve files with colons to Linux CIFS/VFS client
    Looks like the pathname parsing for POSIX paths got
    broken when the code for doing Windows streams parsing got added.
    Jeremy.

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

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


Changeset truncated at 500 lines:

diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index a743385..8b560bd 100644
--- a/source3/smbd/reply.c
+++ b/source3/smbd/reply.c
@@ -72,11 +72,16 @@ static NTSTATUS check_path_syntax_internal(char *path,
 			}
 		}
 
-		if (!stream_started && *s == ':') {
+		if (!posix_path && !stream_started && *s == ':') {
 			if (*p_last_component_contains_wcard) {
 				return NT_STATUS_OBJECT_NAME_INVALID;
 			}
-			/* stream names allow more characters than file names */
+			/* Stream names allow more characters than file names.
+			   We're overloading posix_path here to allow a wider
+			   range of characters. If stream_started is true this
+			   is still a Windows path even if posix_path is true.
+			   JRA.
+			*/
 			stream_started = true;
 			start_of_name_component = false;
 			posix_path = true;


-- 
Samba Shared Repository