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 09689840280c791d9fe410fb16f47bc73ecdb2ec..4affd4a8cfe129b10f75ef23daa52585cc6a503f 100644 (file)
--- 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 5f50b64f4fd11a2a623dae2a9ebcb1f139132418..9c69b3bf2cb9699dcf0e9c0daa9534970b60b901 100644 (file)
--- 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
        };