From 8dda4cea660639190c1c7e84355186d07a6e064f Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 1 Dec 2009 14:08:16 -0800 Subject: 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. --- source3/include/smb.h | 2 -- source3/smbd/trans2.c | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/source3/include/smb.h b/source3/include/smb.h index 0968984028..4affd4a8cf 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 5f50b64f4f..9c69b3bf2c 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 }; -- cgit