summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJames Peach <jpeach@samba.org>2007-06-08 23:08:41 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:23:13 -0500
commit0ae0d33a3a396cfbd540a86a8c7384cb075bfe0c (patch)
treeb13f6cd5319f160b2924777a5c2ceed128272f53 /source3
parent74c74f8dccc01c99c8098dcb0dcae5cfaa81566d (diff)
downloadsamba-0ae0d33a3a396cfbd540a86a8c7384cb075bfe0c.tar.gz
samba-0ae0d33a3a396cfbd540a86a8c7384cb075bfe0c.tar.bz2
samba-0ae0d33a3a396cfbd540a86a8c7384cb075bfe0c.zip
r23396: Make VFS callbacks static. Mark operations as OPAQUE because they
do not pass through. (This used to be commit b9d6eee5d4d0894ded88455675a470cbf04d8f45)
Diffstat (limited to 'source3')
-rw-r--r--source3/modules/vfs_zfsacl.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/source3/modules/vfs_zfsacl.c b/source3/modules/vfs_zfsacl.c
index 72dde886bd..79602c2221 100644
--- a/source3/modules/vfs_zfsacl.c
+++ b/source3/modules/vfs_zfsacl.c
@@ -133,14 +133,15 @@ static BOOL zfs_set_nt_acl(vfs_handle_struct *handle, files_struct *fsp,
zfs_process_smbacl);
}
-size_t zfsacl_fget_nt_acl(struct vfs_handle_struct *handle,
+static size_t zfsacl_fget_nt_acl(struct vfs_handle_struct *handle,
struct files_struct *fsp,
int fd, uint32 security_info,
struct security_descriptor **ppdesc)
{
return zfs_get_nt_acl(fsp, security_info, ppdesc);
}
-size_t zfsacl_get_nt_acl(struct vfs_handle_struct *handle,
+
+static size_t zfsacl_get_nt_acl(struct vfs_handle_struct *handle,
struct files_struct *fsp,
const char *name, uint32 security_info,
struct security_descriptor **ppdesc)
@@ -148,7 +149,7 @@ size_t zfsacl_get_nt_acl(struct vfs_handle_struct *handle,
return zfs_get_nt_acl(fsp, security_info, ppdesc);
}
-BOOL zfsacl_fset_nt_acl(vfs_handle_struct *handle,
+static BOOL zfsacl_fset_nt_acl(vfs_handle_struct *handle,
files_struct *fsp,
int fd, uint32 security_info_sent,
SEC_DESC *psd)
@@ -156,7 +157,7 @@ BOOL zfsacl_fset_nt_acl(vfs_handle_struct *handle,
return zfs_set_nt_acl(handle, fsp, security_info_sent, psd);
}
-BOOL zfsacl_set_nt_acl(vfs_handle_struct *handle,
+static BOOL zfsacl_set_nt_acl(vfs_handle_struct *handle,
files_struct *fsp,
const char *name, uint32 security_info_sent,
SEC_DESC *psd)
@@ -168,13 +169,13 @@ BOOL zfsacl_set_nt_acl(vfs_handle_struct *handle,
static vfs_op_tuple zfsacl_ops[] = {
{SMB_VFS_OP(zfsacl_fget_nt_acl), SMB_VFS_OP_FGET_NT_ACL,
- SMB_VFS_LAYER_TRANSPARENT},
+ SMB_VFS_LAYER_OPAQUE},
{SMB_VFS_OP(zfsacl_get_nt_acl), SMB_VFS_OP_GET_NT_ACL,
- SMB_VFS_LAYER_TRANSPARENT},
+ SMB_VFS_LAYER_OPAQUE},
{SMB_VFS_OP(zfsacl_fset_nt_acl), SMB_VFS_OP_FSET_NT_ACL,
- SMB_VFS_LAYER_TRANSPARENT},
+ SMB_VFS_LAYER_OPAQUE},
{SMB_VFS_OP(zfsacl_set_nt_acl), SMB_VFS_OP_SET_NT_ACL,
- SMB_VFS_LAYER_TRANSPARENT},
+ SMB_VFS_LAYER_OPAQUE},
{SMB_VFS_OP(NULL), SMB_VFS_OP_NOOP, SMB_VFS_LAYER_NOOP}
};