summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Prouty <tprouty@samba.org>2009-01-04 17:36:36 -0800
committerTim Prouty <tprouty@samba.org>2009-01-04 19:31:30 -0800
commit7ae992b622af62e9cfcbc9077f23eff8c2fe0d15 (patch)
tree9d3d380bee20dfc7864ded8f377aa1a6f503616f
parent3e0e756104dc77059843bcef4a8d44981df28a18 (diff)
downloadsamba-7ae992b622af62e9cfcbc9077f23eff8c2fe0d15.tar.gz
samba-7ae992b622af62e9cfcbc9077f23eff8c2fe0d15.tar.bz2
samba-7ae992b622af62e9cfcbc9077f23eff8c2fe0d15.zip
s3: Remove a few unnecessary checks from the streams xattr module
Handling of error codes when renaming a file to a stream and a stream to a file is now done in rename_internals_fsp. The NTRENAME stream path only passes in the stream name, so the new base can now be different from the old base.
-rw-r--r--source3/modules/vfs_streams_xattr.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/source3/modules/vfs_streams_xattr.c b/source3/modules/vfs_streams_xattr.c
index ecfc31970d..7124c57520 100644
--- a/source3/modules/vfs_streams_xattr.c
+++ b/source3/modules/vfs_streams_xattr.c
@@ -511,11 +511,6 @@ static int streams_xattr_rename(vfs_handle_struct *handle,
return SMB_VFS_NEXT_RENAME(handle, oldname, newname);
}
- if (!(o_is_stream && n_is_stream)) {
- errno = ENOSYS;
- goto fail;
- }
-
frame = talloc_stackframe();
if (!frame) {
goto fail;
@@ -544,12 +539,6 @@ static int streams_xattr_rename(vfs_handle_struct *handle,
goto fail;
}
- /* the new base should be empty */
- if (StrCaseCmp(obase, nbase) != 0) {
- errno = ENOSYS;
- goto fail;
- }
-
if (StrCaseCmp(ostream, nstream) == 0) {
goto done;
}