Start fixing the RAW-STREAMS test - ensure that the xattr

used to store the stream info in streams_depot.so is not
seen in when enumerating EAs.
Jeremy.

diff --git a/source3/include/smb.h b/source3/include/smb.h
index cee95a9b170bfffb2d6368dbfa1ee8438fa493ed..2ff60f6c44e0c65518428417429ce4d1ce16e53f 100644 (file)
--- a/source3/include/smb.h
+++ b/source3/include/smb.h
@@ -1889,6 +1889,8 @@ struct ea_list {
 #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"
 
 #define UUID_SIZE 16
 

diff --git a/source3/modules/vfs_streams_depot.c b/source3/modules/vfs_streams_depot.c
index 51cd56e8fb49a55b0e0715a1fa1277f81b08c0ed..d7b878b882a9900da632bbcead719725d7c8d28b 100644 (file)
--- a/source3/modules/vfs_streams_depot.c
+++ b/source3/modules/vfs_streams_depot.c
@@ -65,8 +65,6 @@ static uint32_t hash_fn(DATA_BLOB key)
  * an option to put in a special ACL entry for a non-existing group.
  */
 
-#define SAMBA_XATTR_MARKER "user.SAMBA_STREAMS"
-
 static bool file_is_valid(vfs_handle_struct *handle, const char *path,
                          bool check_valid)
 {

diff --git a/source3/smbd/trans2.c b/source3/smbd/trans2.c
index ce458126d3cc9d9765fc30b0145aacaee0700be1..59b778cf45c74da4cd6a71588e94d6826cd0a4da 100644 (file)
--- a/source3/smbd/trans2.c
+++ b/source3/smbd/trans2.c
@@ -73,6 +73,7 @@ static bool samba_private_attr_name(const char *unix_ea_name)
                SAMBA_POSIX_INHERITANCE_EA_NAME,
                SAMBA_XATTR_DOS_ATTRIB,
                SAMBA_XATTR_DOSTIMESTAMPS,
+               SAMBA_XATTR_MARKER,
                NULL
        };