summaryrefslogtreecommitdiff
path: root/source/smbd/reply.c
diff options
context:
space:
mode:
authorbubulle <bubulle@alioth.debian.org>2009-04-02 15:54:13 +0000
committerbubulle <bubulle@alioth.debian.org>2009-04-02 15:54:13 +0000
commitbf9afdb5c20707c5af271cbdfd98f0bb60180eb1 (patch)
treef72e29d251d990358e3a080aa35c801104fa54ba /source/smbd/reply.c
parentfe09995a9ad2d43523063725462194c7b39a3ce9 (diff)
downloadsamba-bf9afdb5c20707c5af271cbdfd98f0bb60180eb1.tar.gz
merge upstream 3.3.3
git-svn-id: svn://svn.debian.org/svn/pkg-samba/trunk/samba@2683 fc4039ab-9d04-0410-8cac-899223bdd6b0
Diffstat (limited to 'source/smbd/reply.c')
-rw-r--r--source/smbd/reply.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/source/smbd/reply.c b/source/smbd/reply.c
index 499b67fb9f..46653cd9c5 100644
--- a/source/smbd/reply.c
+++ b/source/smbd/reply.c
@@ -76,11 +76,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;