nfs4acls: Make smbacl4_vfs_params public

vfs_gpfs & others will be able to embed this structure in their special config.

We could have gone with an anonymous struct and a talloc'ed object, but for my
taste this is specialized and hidden enough that it's not worth the
indirection.

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>

diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
index 8ab0ff9b7b480ce5c32beb319ac4270552250607..9fb0e22692c8dcc4ea9fca1fad3e15493b8dfd07 100644 (file)
--- a/source3/modules/nfs4_acls.c
+++ b/source3/modules/nfs4_acls.c
@@ -51,23 +51,11 @@ struct SMB4ACL_T
        struct SMB4ACE_T        *last;
 };
 
-enum smbacl4_mode_enum {e_simple=0, e_special=1};
-enum smbacl4_acedup_enum {e_dontcare=0, e_reject=1, e_ignore=2, e_merge=3};
-
-struct smbacl4_vfs_params {
-       enum smbacl4_mode_enum mode;
-       bool do_chown;
-       enum smbacl4_acedup_enum acedup;
-       bool map_full_control;
-};
-
 /*
  * Gather special parameters for NFS4 ACL handling
  */
-static int smbacl4_get_vfs_params(
-       struct connection_struct *conn,
-       struct smbacl4_vfs_params *params
-)
+int smbacl4_get_vfs_params(struct connection_struct *conn,
+                          struct smbacl4_vfs_params *params)
 {
        static const struct enum_list enum_smbacl4_modes[] = {
                { e_simple, "simple" },

diff --git a/source3/modules/nfs4_acls.h b/source3/modules/nfs4_acls.h
index 4236495a78c1dd1de9c81a43ecb07961483d536d..ba6761dcaafe3c1be79d3f9c02c8a03b241b907f 100644 (file)
--- a/source3/modules/nfs4_acls.h
+++ b/source3/modules/nfs4_acls.h
@@ -109,7 +109,19 @@ typedef struct _SMB_ACE4PROP_T {
 
 struct SMB4ACL_T;
 struct SMB4ACE_T;
-struct smbacl4_vfs_params;
+
+enum smbacl4_mode_enum {e_simple=0, e_special=1};
+enum smbacl4_acedup_enum {e_dontcare=0, e_reject=1, e_ignore=2, e_merge=3};
+
+struct smbacl4_vfs_params {
+       enum smbacl4_mode_enum mode;
+       bool do_chown;
+       enum smbacl4_acedup_enum acedup;
+       bool map_full_control;
+};
+
+int smbacl4_get_vfs_params(struct connection_struct *conn,
+                          struct smbacl4_vfs_params *params);
 
 struct SMB4ACL_T *smb_create_smb4acl(TALLOC_CTX *mem_ctx);