summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2009-10-29 16:14:12 -0700
committerJeremy Allison <jra@samba.org>2009-10-29 16:14:12 -0700
commit921aa99b37eba62601e32ee7e8cbd447ca2d737d (patch)
treeff42ab3cfb0535f02e52760e290cb895af472caf /source3
parentf88ab1b1515b248dde4674caf602c04b40c46055 (diff)
downloadsamba-921aa99b37eba62601e32ee7e8cbd447ca2d737d.tar.gz
samba-921aa99b37eba62601e32ee7e8cbd447ca2d737d.tar.bz2
samba-921aa99b37eba62601e32ee7e8cbd447ca2d737d.zip
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.
Diffstat (limited to 'source3')
-rw-r--r--source3/include/smb.h2
-rw-r--r--source3/modules/vfs_streams_depot.c2
-rw-r--r--source3/smbd/trans2.c1
3 files changed, 3 insertions, 2 deletions
diff --git a/source3/include/smb.h b/source3/include/smb.h
index cee95a9b17..2ff60f6c44 100644
--- 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 51cd56e8fb..d7b878b882 100644
--- 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 ce458126d3..59b778cf45 100644
--- 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
};