From f29b9278bb782b48c4f31dd7d42dc530ce598969 Mon Sep 17 00:00:00 2001
From: Andrew Tridgell <tridge@samba.org>
Date: Tue, 14 Jun 2005 01:11:24 +0000
Subject: r7557: trigger a probe at tconx time to see if xattrs are really
 supported by the filesystem (This used to be commit
 71e281ae2fe2ce169aeb09f72376a60d28845808)

---
 source4/ntvfs/posix/pvfs_xattr.c | 14 ++++++++++++++
 source4/ntvfs/posix/vfs_posix.c  |  5 +++++
 2 files changed, 19 insertions(+)

(limited to 'source4/ntvfs')

diff --git a/source4/ntvfs/posix/pvfs_xattr.c b/source4/ntvfs/posix/pvfs_xattr.c
index 7c4fa317d6..e67253e657 100644
--- a/source4/ntvfs/posix/pvfs_xattr.c
+++ b/source4/ntvfs/posix/pvfs_xattr.c
@@ -458,3 +458,17 @@ NTSTATUS pvfs_xattr_save(struct pvfs_state *pvfs,
 	return status;
 }
 
+
+/*
+  probe for system support for xattrs
+*/
+void pvfs_xattr_probe(struct pvfs_state *pvfs)
+{
+	TALLOC_CTX *tmp_ctx = talloc_new(pvfs);
+	DATA_BLOB blob;
+	pull_xattr_blob(pvfs, tmp_ctx, "user.XattrProbe", pvfs->base_directory, 
+			-1, 1, &blob);
+	pull_xattr_blob(pvfs, tmp_ctx, "security.XattrProbe", pvfs->base_directory, 
+			-1, 1, &blob);
+	talloc_free(tmp_ctx);
+}
diff --git a/source4/ntvfs/posix/vfs_posix.c b/source4/ntvfs/posix/vfs_posix.c
index 1d3979aabf..846ba61a86 100644
--- a/source4/ntvfs/posix/vfs_posix.c
+++ b/source4/ntvfs/posix/vfs_posix.c
@@ -91,6 +91,11 @@ static void pvfs_setup_options(struct pvfs_state *pvfs)
 #ifdef HAVE_BLKID
 	pvfs->blkid_cache = NULL;
 #endif
+
+	/* check if the system really supports xattrs */
+	if (pvfs->flags & PVFS_FLAG_XATTR_ENABLE) {
+		pvfs_xattr_probe(pvfs);
+	}
 }
 
 
-- 
cgit