svn commit: samba r7557 - in branches/SAMBA_4_0/source/ntvfs/posix: .

[tridge at samba.org]

Author: tridge
Date: 2005-06-14 01:11:24 +0000 (Tue, 14 Jun 2005)
New Revision: 7557

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=7557

Log:
trigger a probe at tconx time to see if xattrs are really supported by
the filesystem

Modified:
   branches/SAMBA_4_0/source/ntvfs/posix/pvfs_xattr.c
   branches/SAMBA_4_0/source/ntvfs/posix/vfs_posix.c


Changeset:
Modified: branches/SAMBA_4_0/source/ntvfs/posix/pvfs_xattr.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/posix/pvfs_xattr.c	2005-06-14 01:04:20 UTC (rev 7556)
+++ branches/SAMBA_4_0/source/ntvfs/posix/pvfs_xattr.c	2005-06-14 01:11:24 UTC (rev 7557)
@@ -458,3 +458,17 @@
 	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);
+}

Modified: branches/SAMBA_4_0/source/ntvfs/posix/vfs_posix.c
===================================================================
--- branches/SAMBA_4_0/source/ntvfs/posix/vfs_posix.c	2005-06-14 01:04:20 UTC (rev 7556)
+++ branches/SAMBA_4_0/source/ntvfs/posix/vfs_posix.c	2005-06-14 01:11:24 UTC (rev 7557)
@@ -91,6 +91,11 @@
 #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);
+	}
 }