[SCM] Samba Shared Repository - branch master updated
Jeremy Allison
jra at samba.org
Thu Oct 29 17:17:27 MDT 2009
The branch, master has been updated
via 921aa99... 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.
from f88ab1b... s3: Fix incorrect rc check of nscd_flush_cache.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 921aa99b37eba62601e32ee7e8cbd447ca2d737d
Author: Jeremy Allison <jra at samba.org>
Date: Thu Oct 29 16:14:12 2009 -0700
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.
-----------------------------------------------------------------------
Summary of changes:
source3/include/smb.h | 2 ++
source3/modules/vfs_streams_depot.c | 2 --
source3/smbd/trans2.c | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/smb.h b/source3/include/smb.h
index cee95a9..2ff60f6 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 51cd56e..d7b878b 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 ce45812..59b778c 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
};
--
Samba Shared Repository
More information about the samba-cvs
mailing list