diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-03-20 16:40:09 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-03-20 16:40:09 +0100 |
| commit | ca202cf464aec82e63be4b2160f394f56b8c195e (patch) | |
| tree | 58b432b7d67c5cf3b35a16c7df9b028d39e3b3a5 /source3/smbd/reply.c | |
| parent | 44787565715f0622cc1d049854427d735ca1c14b (diff) | |
| parent | 2de464a7658f91d2d01087080b984d52c3483426 (diff) | |
| download | samba-ca202cf464aec82e63be4b2160f394f56b8c195e.tar.gz samba-ca202cf464aec82e63be4b2160f394f56b8c195e.tar.xz samba-ca202cf464aec82e63be4b2160f394f56b8c195e.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into displaysec
Diffstat (limited to 'source3/smbd/reply.c')
| -rw-r--r-- | source3/smbd/reply.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/source3/smbd/reply.c b/source3/smbd/reply.c index a743385f7f5..8b560bd8ca6 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; |