summaryrefslogtreecommitdiffstats
path: root/source4/ntvfs/posix/pvfs_setfileinfo.c
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-11-17 06:44:50 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:05:55 -0500
commit856f663adc2459044f7a20c2974bcb41ed561f77 (patch)
tree3aefe3b37e74025d61d5930360a77c2401c6a91c /source4/ntvfs/posix/pvfs_setfileinfo.c
parent5a34ef4df6152f5e970afbfb463d4665a823deb7 (diff)
downloadsamba-856f663adc2459044f7a20c2974bcb41ed561f77.tar.gz
samba-856f663adc2459044f7a20c2974bcb41ed561f77.tar.xz
samba-856f663adc2459044f7a20c2974bcb41ed561f77.zip
r3800: - fixed delete-on-close behaviour for streams
- added a delete-on-close test to RAW-STREAMS - don't allow rename of streams at the moment (I need to work out if its supposed to be allowed first) (This used to be commit f4b2b1311da6e37ac0947a3419d89c77ebbd6b63)
Diffstat (limited to 'source4/ntvfs/posix/pvfs_setfileinfo.c')
-rw-r--r--source4/ntvfs/posix/pvfs_setfileinfo.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/source4/ntvfs/posix/pvfs_setfileinfo.c b/source4/ntvfs/posix/pvfs_setfileinfo.c
index ede07983b3a..58a3372f820 100644
--- a/source4/ntvfs/posix/pvfs_setfileinfo.c
+++ b/source4/ntvfs/posix/pvfs_setfileinfo.c
@@ -48,6 +48,11 @@ static NTSTATUS pvfs_setfileinfo_rename(struct pvfs_state *pvfs,
return NT_STATUS_FILE_IS_A_DIRECTORY;
}
+ /* don't allow stream renames for now */
+ if (name->stream_name) {
+ return NT_STATUS_INVALID_PARAMETER;
+ }
+
/* w2k3 does not appear to allow relative rename */
if (r->root_fid != 0) {
return NT_STATUS_INVALID_PARAMETER;
@@ -366,7 +371,8 @@ NTSTATUS pvfs_setpathinfo(struct ntvfs_module_context *ntvfs,
struct utimbuf unix_times;
/* resolve the cifs name to a posix name */
- status = pvfs_resolve_name(pvfs, req, info->generic.file.fname, 0, &name);
+ status = pvfs_resolve_name(pvfs, req, info->generic.file.fname,
+ PVFS_RESOLVE_STREAMS, &name);
if (!NT_STATUS_IS_OK(status)) {
return status;
}