summaryrefslogtreecommitdiff
path: root/source3/smbd
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2009-03-20 10:01:17 +1100
committerAndrew Tridgell <tridge@samba.org>2009-03-20 10:01:17 +1100
commit9709ddcd3db3a96ff4d86aa1a5daf7f9261f13d3 (patch)
tree94bd92a2eec2f966577ebba35468530b1f315aba /source3/smbd
parent844a1b3cd27f323087b707e494c5e3860340eb27 (diff)
parent3a4638db0351368d3b148bf547546f28fa0b1479 (diff)
downloadsamba-9709ddcd3db3a96ff4d86aa1a5daf7f9261f13d3.tar.gz
samba-9709ddcd3db3a96ff4d86aa1a5daf7f9261f13d3.tar.bz2
samba-9709ddcd3db3a96ff4d86aa1a5daf7f9261f13d3.zip
Merge branch 'master' of ssh://git.samba.org/data/git/samba
Diffstat (limited to 'source3/smbd')
-rw-r--r--source3/smbd/reply.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c
index a743385f7f..8b560bd8ca 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;