The branch, master has been updated
via 0788436b579b78088bfa9d77fb4c47f652ad5eb8 (commit)
via 1f83aafac85fad3f996f1dfd92e553b030de50d0 (commit)
from 049534336c8df538ab3c384c0f505cf3bc6a1300 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 0788436b579b78088bfa9d77fb4c47f652ad5eb8
Merge: 1f83aafac85fad3f996f1dfd92e553b030de50d0
049534336c8df538ab3c384c0f505cf3bc6a1300
Author: Jeremy Allison <[email protected]>
Date: Thu Mar 26 15:33:40 2009 -0700
Merge branch 'master' of ssh://[email protected]/data/git/samba
commit 1f83aafac85fad3f996f1dfd92e553b030de50d0
Author: Jeremy Allison <[email protected]>
Date: Thu Mar 26 15:30:42 2009 -0700
Try and fix the build farm RAW-STREAMS errors. Ordering of
modules shouldn't matter, so as vfs_streams_depot doesn't
implement get/setxattrs then call into the full VFS stack
at the top.
Jeremy
-----------------------------------------------------------------------
Summary of changes:
source3/modules/vfs_streams_depot.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_streams_depot.c
b/source3/modules/vfs_streams_depot.c
index 023d2b9..e5a70b1 100644
--- a/source3/modules/vfs_streams_depot.c
+++ b/source3/modules/vfs_streams_depot.c
@@ -78,7 +78,7 @@ static bool file_is_valid(vfs_handle_struct *handle, const
char *path,
DEBUG(10, ("file_is_valid (%s) called\n", path));
- if (SMB_VFS_NEXT_GETXATTR(handle, path, SAMBA_XATTR_MARKER,
+ if (SMB_VFS_GETXATTR(handle->conn, path, SAMBA_XATTR_MARKER,
&buf, sizeof(buf)) != sizeof(buf)) {
DEBUG(10, ("GETXATTR failed: %s\n", strerror(errno)));
return false;
@@ -104,7 +104,7 @@ static bool mark_file_valid(vfs_handle_struct *handle,
const char *path,
DEBUG(10, ("marking file %s as valid\n", path));
- ret = SMB_VFS_NEXT_SETXATTR(handle, path, SAMBA_XATTR_MARKER,
+ ret = SMB_VFS_SETXATTR(handle->conn, path, SAMBA_XATTR_MARKER,
&buf, sizeof(buf), 0);
if (ret == -1) {
--
Samba Shared Repository
