[SCM] Samba Shared Repository - branch master updated

[Jeremy Allison]

The branch, master has been updated
       via  8dda4ce... 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.
      from  ae64978... s3: Fix smbd to correctly return INVALID_LEVEL on set_file_end_of_file_info for paths

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 8dda4cea660639190c1c7e84355186d07a6e064f
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Dec 1 14:08:16 2009 -0800

    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.

-----------------------------------------------------------------------

Summary of changes:
 source3/include/smb.h |    2 --
 source3/smbd/trans2.c |    2 +-
 2 files changed, 1 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/include/smb.h b/source3/include/smb.h
index 0968984..4affd4a 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 5f50b64..9c69b3b 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
 	};
 


-- 
Samba Shared Repository