Adding upstream version 4.2.2.upstream/4.2.2

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 599 insertions, 0 deletions

diff --git a/epan/dissectors/packet-nfsacl.c b/epan/dissectors/packet-nfsacl.c
new file mode 100644
index 00000000..470b2092
--- /dev/null
+++ b/epan/dissectors/packet-nfsacl.c
@@ -0,0 +1,599 @@
+/* packet-nfsacl.c
+ * Stubs for Sun's NFS ACL RPC service (runs on port 2049, and is presumably
+ * handled by the same kernel server code that handles NFS)
+ *
+ * Guy Harris <guy@alum.mit.edu>
+ *
+ * Wireshark - Network traffic analyzer
+ * By Gerald Combs <gerald@wireshark.org>
+ * Copyright 1998 Gerald Combs
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+#include "config.h"
+
+
+#include "packet-nfs.h"
+
+void proto_register_nfsacl(void);
+void proto_reg_handoff_nfsacl(void);
+
+static int proto_nfsacl = -1;
+static int hf_nfsacl_mask = -1;
+static int hf_nfsacl_mask_acl_entry = -1;
+static int hf_nfsacl_mask_acl_count = -1;
+static int hf_nfsacl_mask_default_acl_entry = -1;
+static int hf_nfsacl_mask_default_acl_count = -1;
+static int hf_nfsacl_procedure_v1 = -1;
+static int hf_nfsacl_procedure_v2 = -1;
+static int hf_nfsacl_procedure_v3 = -1;
+static int hf_nfsacl_entry = -1;
+static int hf_nfsacl_aclcnt = -1;
+static int hf_nfsacl_dfaclcnt = -1;
+static int hf_nfsacl_aclent = -1;
+static int hf_nfsacl_aclent_type = -1;
+static int hf_nfsacl_aclent_uid = -1;
+static int hf_nfsacl_aclent_perm = -1;
+static int hf_nfsacl_aclent_perm_read = -1;
+static int hf_nfsacl_aclent_perm_write = -1;
+static int hf_nfsacl_aclent_perm_exec = -1;
+static int hf_nfsacl_create = -1;
+
+static gint ett_nfsacl = -1;
+static gint ett_nfsacl_mask = -1;
+static gint ett_nfsacl_entry = -1;
+static gint ett_nfsacl_aclent = -1;
+static gint ett_nfsacl_aclent_perm = -1;
+static gint ett_nfsacl_aclent_entries = -1;
+
+#define NFSACL_PROGRAM	100227
+
+#define NFSACLPROC_NULL		0
+
+#define NFSACLPROC2_GETACL	1
+#define NFSACLPROC2_SETACL	2
+#define NFSACLPROC2_GETATTR	3
+#define NFSACLPROC2_ACCESS	4
+#define NFSACLPROC2_GETXATTRDIR 5
+
+#define NFSACLPROC3_GETACL	1
+#define NFSACLPROC3_SETACL	2
+#define NFSACLPROC3_GETXATTRDIR 3
+
+#define ACL2_OK 0
+#define ACL3_OK 0
+
+static int
+dissect_nfsacl_mask(tvbuff_t *tvb, int offset, proto_tree *tree)
+{
+	proto_item *mask_item;
+	proto_tree *mask_tree;
+
+	if (tree)
+	{
+		mask_item = proto_tree_add_item(tree, hf_nfsacl_mask, tvb, offset, 4, ENC_BIG_ENDIAN);
+		mask_tree = proto_item_add_subtree(mask_item, ett_nfsacl_mask);
+
+		proto_tree_add_item(mask_tree, hf_nfsacl_mask_acl_entry, tvb, offset, 4, ENC_BIG_ENDIAN);
+		proto_tree_add_item(mask_tree, hf_nfsacl_mask_acl_count, tvb, offset, 4, ENC_BIG_ENDIAN);
+		proto_tree_add_item(mask_tree, hf_nfsacl_mask_default_acl_entry, tvb, offset, 4, ENC_BIG_ENDIAN);
+		proto_tree_add_item(mask_tree, hf_nfsacl_mask_default_acl_count, tvb, offset, 4, ENC_BIG_ENDIAN);
+	}
+
+	offset += 4;
+	return offset;
+}
+
+#define NA_READ 0x4
+#define NA_WRITE 0x2
+#define NA_EXEC 0x1
+
+static const value_string names_nfsacl_aclent_type[] = {
+#define NA_USER_OBJ 0x1
+	{ NA_USER_OBJ,			 "NA_USER_OBJ" },
+#define NA_USER 0x2
+	{ NA_USER,			 "NA_USER" },
+#define NA_GROUP_OBJ 0x4
+	{ NA_GROUP_OBJ,			 "NA_GROUP_OBJ" },
+#define NA_GROUP 0x8
+	{ NA_GROUP,			 "NA_GROUP" },
+#define NA_CLASS_OBJ 0x10
+	{ NA_CLASS_OBJ,			 "NA_CLASS_OBJ" },
+#define NA_OTHER_OBJ 0x20
+	{ NA_OTHER_OBJ,			 "NA_OTHER_OBJ" },
+#define NA_ACL_DEFAULT 0x1000
+	{ NA_ACL_DEFAULT,		 "NA_ACL_DEFAULT" },
+	{ NA_ACL_DEFAULT | NA_USER_OBJ,	 "Default NA_USER_OBJ" },
+	{ NA_ACL_DEFAULT | NA_USER,	 "Default NA_USER" },
+	{ NA_ACL_DEFAULT | NA_GROUP_OBJ, "Default NA_GROUP_OBJ" },
+	{ NA_ACL_DEFAULT | NA_GROUP,	 "Default NA_GROUP" },
+	{ NA_ACL_DEFAULT | NA_CLASS_OBJ, "Default NA_CLASS_OBJ" },
+	{ NA_ACL_DEFAULT | NA_OTHER_OBJ, "Default NA_OTHER_OBJ" },
+	{ 0, NULL },
+};
+
+static int
+dissect_nfsacl_aclent(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
+		      proto_tree* tree)
+{
+	proto_item *entry_item = NULL;
+	proto_tree *entry_tree = NULL;
+	proto_item *perm_item = NULL;
+	proto_tree *perm_tree = NULL;
+
+	if (tree)
+	{
+		entry_item = proto_tree_add_item(tree, hf_nfsacl_aclent, tvb,
+						 offset + 0, -1, ENC_NA);
+		entry_tree = proto_item_add_subtree(entry_item, ett_nfsacl_aclent);
+	}
+
+	offset = dissect_rpc_uint32(tvb, entry_tree, hf_nfsacl_aclent_type, offset);
+	offset = dissect_rpc_uint32(tvb, entry_tree, hf_nfsacl_aclent_uid, offset);
+
+	perm_item = proto_tree_add_item(entry_tree, hf_nfsacl_aclent_perm,
+					tvb, offset, 4, ENC_BIG_ENDIAN);
+	perm_tree = proto_item_add_subtree(perm_item, ett_nfsacl_aclent_perm);
+	proto_tree_add_item(perm_tree, hf_nfsacl_aclent_perm_read, tvb, offset, 4, ENC_BIG_ENDIAN);
+	proto_tree_add_item(perm_tree, hf_nfsacl_aclent_perm_write, tvb, offset, 4, ENC_BIG_ENDIAN);
+	proto_tree_add_item(perm_tree, hf_nfsacl_aclent_perm_exec, tvb, offset, 4, ENC_BIG_ENDIAN);
+	offset += 4;
+
+	return offset;
+}
+
+
+static int
+dissect_nfsacl_secattr(tvbuff_t *tvb, int offset, packet_info *pinfo _U_,
+		       proto_tree *tree)
+{
+	guint32 aclcnt, dfaclcnt;
+	guint32 i;
+	proto_tree *entry_tree;
+
+	offset = dissect_nfsacl_mask(tvb, offset, tree);
+	offset = dissect_rpc_uint32(tvb, tree, hf_nfsacl_aclcnt, offset);
+
+	aclcnt = tvb_get_ntohl(tvb, offset);
+
+	entry_tree = proto_tree_add_subtree_format(tree, tvb, offset, 4,
+			ett_nfsacl_aclent_entries, NULL, "Total ACL entries: %d", aclcnt);
+
+	offset += 4;
+
+	if (aclcnt > 0)
+	{
+		for (i = 0; i < aclcnt; i++)
+			offset = dissect_nfsacl_aclent(tvb, offset, pinfo, entry_tree);
+	}
+
+	/* */
+
+	offset = dissect_rpc_uint32(tvb, tree, hf_nfsacl_dfaclcnt, offset);
+
+	dfaclcnt = tvb_get_ntohl(tvb, offset);
+
+	entry_tree = proto_tree_add_subtree_format(tree, tvb, offset, 4,
+			ett_nfsacl_aclent_entries, NULL, "Total default ACL entries: %d", dfaclcnt);
+
+	offset += 4;
+
+	if (dfaclcnt > 0)
+	{
+		for (i = 0; i < dfaclcnt; i++)
+			offset = dissect_nfsacl_aclent(tvb, offset, pinfo, entry_tree);
+	}
+
+	return offset;
+}
+
+/* proc number, "proc name", dissect_request, dissect_reply */
+static const vsff nfsacl1_proc[] = {
+	{ NFSACLPROC_NULL,	"NULL",
+	  dissect_rpc_void,	dissect_rpc_void },
+	{ 0,	NULL,	NULL,	NULL }
+};
+static const value_string nfsacl1_proc_vals[] = {
+	{ NFSACLPROC_NULL,	"NULL" },
+	{ 0,	NULL }
+};
+
+static int
+dissect_nfsacl2_getacl_call(tvbuff_t *tvb, packet_info *pinfo _U_,
+			    proto_tree *tree, void* data)
+{
+	int offset = 0;
+	offset = dissect_fhandle(tvb, offset, pinfo, tree, "fhandle", NULL, (rpc_call_info_value*)data);
+	offset = dissect_nfsacl_mask(tvb, offset, tree);
+	return offset;
+}
+
+static int
+dissect_nfsacl2_getacl_reply(tvbuff_t *tvb, packet_info *pinfo _U_,
+			     proto_tree *tree, void* data _U_)
+{
+	guint32 status;
+	int offset = 0;
+
+	proto_tree_add_item_ret_uint(tree, hf_nfs_status, tvb, offset, 4, ENC_BIG_ENDIAN, &status);
+
+	offset += 4;
+
+	if (status == ACL2_OK)
+	{
+		offset = dissect_nfs2_fattr(tvb, offset, tree, "attr");
+		offset = dissect_nfsacl_secattr(tvb, offset, pinfo, tree);
+	}
+
+	return offset;
+}
+
+static int
+dissect_nfsacl2_setacl_call(tvbuff_t *tvb, packet_info *pinfo _U_,
+			    proto_tree *tree, void* data)
+{
+	int offset = 0;
+	offset = dissect_fhandle(tvb, offset, pinfo, tree, "fhandle", NULL, (rpc_call_info_value*)data);
+	offset = dissect_nfsacl_secattr(tvb, offset, pinfo, tree);
+
+	return offset;
+}
+
+static int
+dissect_nfsacl2_setacl_reply(tvbuff_t *tvb, packet_info *pinfo _U_,
+			     proto_tree *tree, void* data _U_)
+{
+	guint32 status;
+	int offset = 0;
+
+	proto_tree_add_item_ret_uint(tree, hf_nfs_status, tvb, offset + 0, 4, ENC_BIG_ENDIAN, &status);
+
+	offset += 4;
+
+	if (status == ACL2_OK)
+		offset = dissect_nfs2_fattr(tvb, offset, tree, "attr");
+
+	return offset;
+}
+
+static int
+dissect_nfsacl2_getattr_call(tvbuff_t *tvb, packet_info *pinfo _U_,
+			     proto_tree *tree, void* data)
+{
+	return dissect_fhandle(tvb, 0, pinfo, tree, "fhandle", NULL, (rpc_call_info_value*)data);
+}
+
+static int
+dissect_nfsacl2_getattr_reply(tvbuff_t *tvb, packet_info *pinfo _U_,
+			      proto_tree *tree, void* data _U_)
+{
+	return dissect_nfs2_fattr(tvb, 0, tree, "attr");
+}
+
+static int
+dissect_nfsacl2_access_call(tvbuff_t *tvb, packet_info *pinfo _U_,
+			    proto_tree *tree, void* data)
+{
+	guint32 *acc_request, amask;
+	rpc_call_info_value *civ = (rpc_call_info_value*)data;
+	int offset = 0;
+
+	offset = dissect_fhandle(tvb, offset, pinfo, tree, "fhandle", NULL, civ);
+
+	/* Get access mask to check and save it for comparison to the access reply. */
+	amask = tvb_get_ntohl(tvb, offset);
+	acc_request = (guint32 *)wmem_memdup(wmem_file_scope(), &amask, sizeof(guint32));
+	civ->private_data = acc_request;
+
+	display_access_items(tvb, offset, pinfo, tree, amask, 'C', 3, NULL, "Check") ;
+
+	offset+=4;
+	return offset;
+}
+
+static int
+dissect_nfsacl2_access_reply(tvbuff_t *tvb, packet_info *pinfo _U_,
+			     proto_tree *tree, void* data)
+{
+	guint32 status;
+	int offset = 0;
+
+	status = tvb_get_ntohl(tvb, offset + 0);
+
+	proto_tree_add_uint(tree, hf_nfs_status, tvb, offset + 0, 4, status);
+
+	offset += 4;
+
+	if (status == ACL2_OK)
+	{
+		offset = dissect_nfs2_fattr(tvb, offset, tree, "attr");
+		offset = dissect_access_reply(tvb, offset, pinfo, tree, 3, NULL, (rpc_call_info_value*)data);
+	}
+
+	return offset;
+}
+
+static int
+dissect_nfsacl2_getxattrdir_call(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data)
+{
+	int offset = 0;
+	offset = dissect_fhandle(tvb, offset, pinfo, tree, "fhandle", NULL, (rpc_call_info_value*)data);
+	offset = dissect_rpc_bool(tvb, tree, hf_nfsacl_create, offset);
+
+	return offset;
+}
+
+static int
+dissect_nfsacl2_getxattrdir_reply(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data)
+{
+	guint32 status;
+	int offset = 0;
+
+	status = tvb_get_ntohl(tvb, offset + 0);
+
+	proto_tree_add_uint(tree, hf_nfs_status, tvb, offset + 0, 4, status);
+
+	offset += 4;
+
+	if (status == ACL2_OK)
+	{
+		offset = dissect_fhandle(tvb, offset, pinfo, tree, "fhandle", NULL, (rpc_call_info_value*)data);
+		offset = dissect_nfs2_fattr(tvb, offset, tree, "attr");
+	}
+
+	return offset;
+}
+
+static const vsff nfsacl2_proc[] = {
+	{ NFSACLPROC_NULL,	"NULL",
+		dissect_rpc_void,		dissect_rpc_void },
+	{ NFSACLPROC2_GETACL,	"GETACL",
+		dissect_nfsacl2_getacl_call,	dissect_nfsacl2_getacl_reply },
+	{ NFSACLPROC2_SETACL,	"SETACL",
+		dissect_nfsacl2_setacl_call,	dissect_nfsacl2_setacl_reply },
+	{ NFSACLPROC2_GETATTR,	"GETATTR",
+		dissect_nfsacl2_getattr_call,	dissect_nfsacl2_getattr_reply },
+	{ NFSACLPROC2_ACCESS,	"ACCESS",
+		dissect_nfsacl2_access_call,	dissect_nfsacl2_access_reply },
+	{ NFSACLPROC2_GETXATTRDIR,	"GETXATTRDIR",
+		dissect_nfsacl2_getxattrdir_call, dissect_nfsacl2_getxattrdir_reply },
+	{ 0,	NULL,	NULL,	NULL }
+};
+static const value_string nfsacl2_proc_vals[] = {
+	{ NFSACLPROC_NULL,	"NULL" },
+	{ NFSACLPROC2_GETACL,	"GETACL" },
+	{ NFSACLPROC2_SETACL,	"SETACL" },
+	{ NFSACLPROC2_GETATTR,	"GETATTR" },
+	{ NFSACLPROC2_ACCESS,	"ACCESS" },
+	{ NFSACLPROC2_GETXATTRDIR, "GETXATTRDIR" },
+	{ 0,	NULL }
+};
+
+static int
+dissect_nfsacl3_getacl_call(tvbuff_t *tvb, packet_info *pinfo _U_,
+			    proto_tree *tree, void* data)
+{
+	int offset = 0;
+	offset = dissect_nfs3_fh(tvb, offset, pinfo, tree, "fhandle", NULL, (rpc_call_info_value*)data);
+	offset = dissect_nfsacl_mask(tvb, offset, tree);
+
+	return offset;
+}
+
+static int
+dissect_nfsacl3_getacl_reply(tvbuff_t *tvb, packet_info *pinfo _U_,
+			     proto_tree *tree, void* data _U_)
+{
+	guint32 status;
+	proto_item *entry_item;
+	proto_tree *entry_tree;
+	int offset = 0;
+
+	proto_tree_add_item_ret_uint(tree, hf_nfs_status, tvb, offset, 4, ENC_BIG_ENDIAN, &status);
+
+	offset += 4;
+
+	entry_item = proto_tree_add_item(tree, hf_nfsacl_entry, tvb,
+				offset + 0, -1, ENC_NA);
+	entry_tree = proto_item_add_subtree(entry_item, ett_nfsacl_entry);
+
+	offset = dissect_nfs3_post_op_attr(tvb, offset, pinfo, entry_tree, "attr");
+
+	if (status != ACL3_OK)
+		return offset;
+
+	offset = dissect_nfsacl_secattr(tvb, offset, pinfo, entry_tree);
+
+	return offset;
+}
+
+static int
+dissect_nfsacl3_setacl_call(tvbuff_t *tvb, packet_info *pinfo _U_,
+			    proto_tree *tree, void* data)
+
+{
+	proto_item *acl_item;
+	proto_tree *acl_tree;
+	int offset = 0;
+
+	offset = dissect_nfs3_fh(tvb, offset, pinfo, tree, "fhandle", NULL, (rpc_call_info_value*)data);
+
+	acl_item = proto_tree_add_item(tree, hf_nfsacl_entry, tvb, offset + 0,
+				-1, ENC_NA);
+	acl_tree = proto_item_add_subtree(acl_item, ett_nfsacl_entry);
+
+	offset = dissect_nfsacl_secattr(tvb, offset, pinfo, acl_tree);
+
+	return offset;
+}
+
+static int
+dissect_nfsacl3_setacl_reply(tvbuff_t *tvb, packet_info *pinfo _U_,
+			     proto_tree *tree, void* data _U_)
+{
+	guint32 status;
+	int offset = 0;
+
+	proto_tree_add_item_ret_uint(tree, hf_nfs_status, tvb, offset, 4, ENC_BIG_ENDIAN, &status);
+	offset += 4;
+
+	offset = dissect_nfs3_post_op_attr(tvb, offset, pinfo, tree, "attr");
+
+	return offset;
+}
+
+static int
+dissect_nfsacl3_getxattrdir_call(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data)
+
+{
+	int offset = 0;
+
+	offset = dissect_nfs3_fh(tvb, offset, pinfo, tree, "fhandle", NULL, (rpc_call_info_value*)data);
+	offset = dissect_rpc_bool(tvb, tree, hf_nfsacl_create, offset);
+
+	return offset;
+}
+
+static int
+dissect_nfsacl3_getxattrdir_reply(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void* data)
+{
+	guint32 status;
+	int offset = 0;
+
+	proto_tree_add_item_ret_uint(tree, hf_nfs_status, tvb, offset, 4, ENC_BIG_ENDIAN, &status);
+	offset += 4;
+
+	if (status == ACL3_OK)
+	{
+		offset = dissect_nfs3_fh(tvb, offset, pinfo, tree, "fhandle", NULL, (rpc_call_info_value*)data);
+		offset = dissect_nfs3_post_op_attr(tvb, offset, pinfo, tree, "attr");
+	}
+
+	return offset;
+}
+
+static const vsff nfsacl3_proc[] = {
+	{ NFSACLPROC_NULL,	"NULL",
+		dissect_rpc_void,		dissect_rpc_void },
+	{ NFSACLPROC3_GETACL,	"GETACL",
+		dissect_nfsacl3_getacl_call,	dissect_nfsacl3_getacl_reply },
+	{ NFSACLPROC3_SETACL,	"SETACL",
+		dissect_nfsacl3_setacl_call,	dissect_nfsacl3_setacl_reply },
+	{ NFSACLPROC3_GETXATTRDIR,	"GETXATTRDIR",
+		dissect_nfsacl3_getxattrdir_call, dissect_nfsacl3_getxattrdir_reply },
+	{ 0,	NULL,	NULL,	NULL }
+};
+static const value_string nfsacl3_proc_vals[] = {
+	{ NFSACLPROC_NULL,		 "NULL" },
+	{ NFSACLPROC3_GETACL,		 "GETACL" },
+	{ NFSACLPROC3_SETACL,		 "SETACL" },
+	{ NFSACLPROC3_GETXATTRDIR,	 "GETXATTRDIR" },
+	{ 0,	NULL }
+};
+
+static const rpc_prog_vers_info nfsacl_vers_info[] = {
+	{ 1, nfsacl1_proc, &hf_nfsacl_procedure_v1 },
+	{ 2, nfsacl2_proc, &hf_nfsacl_procedure_v2 },
+	{ 3, nfsacl3_proc, &hf_nfsacl_procedure_v3 },
+};
+
+void
+proto_register_nfsacl(void)
+{
+	static hf_register_info hf[] = {
+		{ &hf_nfsacl_mask, {
+			"Mask", "nfsacl.mask", FT_UINT32, BASE_HEX,
+			NULL, 0, NULL, HFILL }},
+		{ &hf_nfsacl_mask_acl_entry, {
+			"ACL entry", "nfsacl.mask.acl_entry", FT_BOOLEAN, 32,
+            TFS(&tfs_yes_no), 0x00000001, NULL, HFILL }},
+		{ &hf_nfsacl_mask_acl_count, {
+			"ACL count", "nfsacl.mask.acl_count", FT_BOOLEAN, 32,
+            TFS(&tfs_yes_no), 0x00000002, NULL, HFILL }},
+		{ &hf_nfsacl_mask_default_acl_entry, {
+			"Default ACL entry", "nfsacl.mask.default_acl_entry", FT_BOOLEAN, 32,
+            TFS(&tfs_yes_no), 0x00000004, NULL, HFILL }},
+		{ &hf_nfsacl_mask_default_acl_count, {
+			"Default ACL count", "nfsacl.mask.default_acl_count", FT_BOOLEAN, 32,
+            TFS(&tfs_yes_no), 0x00000008, NULL, HFILL }},
+		{ &hf_nfsacl_procedure_v1, {
+			"V1 Procedure", "nfsacl.procedure_v1", FT_UINT32, BASE_DEC,
+			VALS(nfsacl1_proc_vals), 0, NULL, HFILL }},
+		{ &hf_nfsacl_procedure_v2, {
+			"V2 Procedure", "nfsacl.procedure_v2", FT_UINT32, BASE_DEC,
+			VALS(nfsacl2_proc_vals), 0, NULL, HFILL }},
+		{ &hf_nfsacl_procedure_v3, {
+			"V3 Procedure", "nfsacl.procedure_v3", FT_UINT32, BASE_DEC,
+			VALS(nfsacl3_proc_vals), 0, NULL, HFILL }},
+			/* generic */
+		{ &hf_nfsacl_entry, {
+			"ACL", "nfsacl.acl", FT_NONE, BASE_NONE,
+			NULL, 0, NULL, HFILL }},
+		{ &hf_nfsacl_aclcnt, {
+			"ACL count", "nfsacl.aclcnt", FT_UINT32, BASE_DEC,
+			NULL, 0, NULL, HFILL }},
+		{ &hf_nfsacl_dfaclcnt, {
+			"Default ACL count", "nfsacl.dfaclcnt", FT_UINT32, BASE_DEC,
+			NULL, 0, NULL, HFILL }},
+		{ &hf_nfsacl_aclent, {
+			"ACL Entry", "nfsacl.aclent", FT_NONE, BASE_NONE,
+			NULL, 0, "ACL", HFILL }},
+		{ &hf_nfsacl_aclent_type, {
+			"Type", "nfsacl.aclent.type", FT_UINT32, BASE_DEC,
+			VALS(names_nfsacl_aclent_type), 0, NULL, HFILL }},
+		{ &hf_nfsacl_aclent_uid, {
+			"UID", "nfsacl.aclent.uid", FT_UINT32, BASE_DEC,
+			NULL, 0, NULL, HFILL }},
+		{ &hf_nfsacl_aclent_perm, {
+			"Permissions", "nfsacl.aclent.perm", FT_UINT32, BASE_DEC,
+			NULL, 0, NULL, HFILL }},
+		{ &hf_nfsacl_aclent_perm_read, {
+			"READ", "nfsacl.aclent.perm.read", FT_BOOLEAN, 32,
+			TFS(&tfs_yes_no), NA_READ, NULL, HFILL }},
+		{ &hf_nfsacl_aclent_perm_write, {
+			"WRITE", "nfsacl.aclent.perm.write", FT_BOOLEAN, 32,
+			TFS(&tfs_yes_no), NA_WRITE, NULL, HFILL }},
+		{ &hf_nfsacl_aclent_perm_exec, {
+			"EXEC", "nfsacl.aclent.perm.exec", FT_BOOLEAN, 32,
+			TFS(&tfs_yes_no), NA_EXEC, NULL, HFILL }},
+			/* V2 */
+		{ &hf_nfsacl_create, {
+			"create", "nfsacl.create", FT_BOOLEAN, BASE_NONE,
+			TFS(&tfs_yes_no), 0x0, "Create?", HFILL }},
+	};
+
+	static gint *ett[] = {
+		&ett_nfsacl,
+		&ett_nfsacl_mask,
+		&ett_nfsacl_entry,
+		&ett_nfsacl_aclent,
+		&ett_nfsacl_aclent_perm,
+		&ett_nfsacl_aclent_entries
+	};
+
+	proto_nfsacl = proto_register_protocol("NFSACL", "NFSACL", "nfsacl");
+	proto_register_field_array(proto_nfsacl, hf, array_length(hf));
+	proto_register_subtree_array(ett, array_length(ett));
+}
+
+void
+proto_reg_handoff_nfsacl(void)
+{
+	/* Register the protocol as RPC */
+	rpc_init_prog(proto_nfsacl, NFSACL_PROGRAM, ett_nfsacl,
+	    G_N_ELEMENTS(nfsacl_vers_info), nfsacl_vers_info);
+}
+
+/*
+ * Editor modelines  -  https://www.wireshark.org/tools/modelines.html
+ *
+ * Local variables:
+ * c-basic-offset: 8
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * End:
+ *
+ * vi: set shiftwidth=8 tabstop=8 noexpandtab:
+ * :indentSize=8:tabSize=8:noTabs=false:
+ */