From: Tim Prouty <tprouty@samba.org>
Date: Mon, 5 Jan 2009 01:36:36 +0000 (-0800)
Subject: s3: Remove a few unnecessary checks from the streams xattr module
X-Git-Tag: samba-4.0.0alpha6~281^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7ae992b622af62e9cfcbc9077f23eff8c2fe0d15;p=thirdparty%2Fsamba.git

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.
---

diff --git a/source3/modules/vfs_streams_xattr.c b/source3/modules/vfs_streams_xattr.c
index ecfc31970da..7124c575203 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;
 	}