diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-05-23 15:20:57 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-05-23 15:20:57 +0200 |
| commit | 1186579f94d81bc633b8f20e8ad8673313c8c39b (patch) | |
| tree | fff2d454029e413304b5679b1c262e3e9e1b87bb /source4/ntvfs/posix/pvfs_resolve.c | |
| parent | 0b62a0875f01370f9db10c45253966f4fed74272 (diff) | |
| parent | 2f653e814a593e4581f28f8ed8158a84a591e9b4 (diff) | |
| download | samba-1186579f94d81bc633b8f20e8ad8673313c8c39b.tar.gz samba-1186579f94d81bc633b8f20e8ad8673313c8c39b.tar.bz2 samba-1186579f94d81bc633b8f20e8ad8673313c8c39b.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into docstrings2
(This used to be commit 7ca46322f5aa650cfd89c4f887393da67ae9dc7b)
Diffstat (limited to 'source4/ntvfs/posix/pvfs_resolve.c')
| -rw-r--r-- | source4/ntvfs/posix/pvfs_resolve.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/source4/ntvfs/posix/pvfs_resolve.c b/source4/ntvfs/posix/pvfs_resolve.c index 325bc74f8f..2e97925c49 100644 --- a/source4/ntvfs/posix/pvfs_resolve.c +++ b/source4/ntvfs/posix/pvfs_resolve.c @@ -202,7 +202,13 @@ static NTSTATUS parse_stream_name(struct pvfs_filename *name, const char *s) } *p = 0; if (strcmp(name->stream_name, "") == 0) { - name->stream_name = NULL; + /* + * we don't set stream_name to NULL, here + * as this would be wrong for directories + * + * pvfs_fill_dos_info() will set it to NULL + * if it's not a directory. + */ name->stream_id = 0; } else { name->stream_id = pvfs_name_hash(name->stream_name, |