From: Jeremy Allison <jra@samba.org>
Date: Tue, 1 Dec 2009 22:08:16 +0000 (-0800)
Subject: Ensure we don't see the xattr used to store NT security (visible when xattr_tdb
X-Git-Tag: samba-4.0.0alpha10~145
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8dda4cea660639190c1c7e84355186d07a6e064f;p=thirdparty%2Fsamba.git

Ensure we don't see the xattr used to store NT security (visible when xattr_tdb
is used). Allows make test to pass with acl_xattr.so prepended to the vfs modules.
Jeremy.
---

diff --git a/source3/include/smb.h b/source3/include/smb.h
index 09689840280..4affd4a8cfe 100644
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1895,8 +1895,6 @@ struct ea_list {
 #define SAMBA_XATTR_DOS_ATTRIB "user.DOSATTRIB"
 /* Prefix for DosStreams in the vfs_streams_xattr module */
 #define SAMBA_XATTR_DOSSTREAM_PREFIX "user.DosStream."
-/* Prefix for DOS timestamps. */
-#define SAMBA_XATTR_DOSTIMESTAMPS "user.DosTimestamps"
 /* Prefix for xattrs storing streams. */
 #define SAMBA_XATTR_MARKER "user.SAMBA_STREAMS"
 
diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index 5f50b64f4fd..9c69b3bf2cb 100644
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -70,8 +70,8 @@ static bool samba_private_attr_name(const char *unix_ea_name)
 	static const char * const prohibited_ea_names[] = {
 		SAMBA_POSIX_INHERITANCE_EA_NAME,
 		SAMBA_XATTR_DOS_ATTRIB,
-		SAMBA_XATTR_DOSTIMESTAMPS,
 		SAMBA_XATTR_MARKER,
+		XATTR_NTACL_NAME,
 		NULL
 	};