smbd: Add extra VFS hooks to get the posix ACL as a blob

This will allow us to hash this, rather than the NT ACL it maps to.
This will in turn allow us to know if the NT ACL is valid even if we
have to change the mapping code.

Andrew Bartlett

Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Wed Sep 12 07:06:01 CEST 2012 on sn-devel-104

1 files changed, 68 insertions, 0 deletions

diff --git a/source3/modules/vfs_fake_acls.c b/source3/modules/vfs_fake_acls.c
index abe65700deb..258cb197c0b 100644
--- a/source3/modules/vfs_fake_acls.c
+++ b/source3/modules/vfs_fake_acls.c
@@ -294,6 +294,72 @@ static SMB_ACL_T fake_acls_sys_acl_get_fd(struct vfs_handle_struct *handle, file
 	return acl;
 }
 
+
+static int fake_acls_sys_acl_blob_get_file(struct vfs_handle_struct *handle, const char *path, SMB_ACL_TYPE_T type, TALLOC_CTX *mem_ctx, 
+					   char **blob_description, DATA_BLOB *blob)
+{
+	ssize_t length;
+	const char *name = NULL;
+	switch (type) {
+	case SMB_ACL_TYPE_ACCESS:
+		name = FAKE_ACL_ACCESS_XATTR;
+		break;
+	case SMB_ACL_TYPE_DEFAULT:
+		name = FAKE_ACL_DEFAULT_XATTR;
+		break;
+	}
+
+	*blob_description = talloc_strdup(mem_ctx, "fake_acls");
+	if (!*blob_description) {
+		errno = ENOMEM;
+		return -1;
+	}
+
+	*blob = data_blob_null;
+	do {
+		blob->length += 1000;
+		blob->data = talloc_realloc(mem_ctx, blob->data, uint8_t, blob->length);
+		if (!blob->data) {
+			errno = ENOMEM;
+			return -1;
+		}
+		length = SMB_VFS_NEXT_GETXATTR(handle, path, name, blob->data, blob->length);
+		blob->length = length;
+	} while (length == -1 && errno == ERANGE);
+	if (length == -1) {
+		return -1;
+	}
+	return 0;
+}
+
+static int fake_acls_sys_acl_blob_get_fd(struct vfs_handle_struct *handle, files_struct *fsp, TALLOC_CTX *mem_ctx, 
+					 char **blob_description, DATA_BLOB *blob)
+{
+	ssize_t length;
+	const char *name = FAKE_ACL_ACCESS_XATTR;
+		
+	*blob_description = talloc_strdup(mem_ctx, "fake_acls");
+	if (!*blob_description) {
+		errno = ENOMEM;
+		return -1;
+	}
+	*blob = data_blob_null;
+	do {
+		blob->length += 1000;
+		blob->data = talloc_realloc(mem_ctx, blob->data, uint8_t, blob->length);
+		if (!blob->data) {
+			errno = ENOMEM;
+			return -1;
+		}
+		length = SMB_VFS_NEXT_FGETXATTR(handle, fsp, name, blob->data, blob->length);
+		blob->length = length;
+	} while (length == -1 && errno == ERANGE);
+	if (length == -1) {
+		return -1;
+	}
+	return 0;
+}
+
 static int fake_acls_sys_acl_set_file(vfs_handle_struct *handle, const char *path, SMB_ACL_TYPE_T acltype, SMB_ACL_T theacl)
 {
 	int ret;
@@ -450,6 +516,8 @@ static struct vfs_fn_pointers vfs_fake_acls_fns = {
 	.fstat_fn = fake_acls_fstat,
 	.sys_acl_get_file_fn = fake_acls_sys_acl_get_file,
 	.sys_acl_get_fd_fn = fake_acls_sys_acl_get_fd,
+	.sys_acl_blob_get_file_fn = fake_acls_sys_acl_blob_get_file,
+	.sys_acl_blob_get_fd_fn = fake_acls_sys_acl_blob_get_fd,
 	.sys_acl_set_file_fn = fake_acls_sys_acl_set_file,
 	.sys_acl_set_fd_fn = fake_acls_sys_acl_set_fd,
 	.sys_acl_delete_def_file_fn = fake_acls_sys_acl_delete_def_file,