summaryrefslogtreecommitdiff
path: root/epan/dissectors/asn1
diff options
context:
space:
mode:
authorMichael Mann <mmann78@netscape.net>2016-06-14 23:17:25 -0400
committerMichael Mann <mmann78@netscape.net>2016-06-15 15:18:37 +0000
commit525fd71b367cc733535e25611728dbf18c7e98ff (patch)
tree90d08870aa27d3611ca0c55fe1b42df5227af284 /epan/dissectors/asn1
parentd25a60c1c1db0d81e332272fe00ec4ef4fb03e65 (diff)
downloadwireshark-525fd71b367cc733535e25611728dbf18c7e98ff.tar.gz
proto_tree_add_boolean -> proto_tree_add_bitmask_list_value
Change-Id: Ic644042d238b5f2abcd874bca92c6dea55804ba9 Reviewed-on: https://code.wireshark.org/review/15913 Petri-Dish: Michael Mann <mmann78@netscape.net> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/asn1')
-rw-r--r--epan/dissectors/asn1/ldap/packet-ldap-template.c29
1 files changed, 13 insertions, 16 deletions
diff --git a/epan/dissectors/asn1/ldap/packet-ldap-template.c b/epan/dissectors/asn1/ldap/packet-ldap-template.c
index 93506058fa..5d797d9e68 100644
--- a/epan/dissectors/asn1/ldap/packet-ldap-template.c
+++ b/epan/dissectors/asn1/ldap/packet-ldap-template.c
@@ -1705,23 +1705,20 @@ dissect_ldap_oid(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *tree, void*
static void
ldap_specific_rights(tvbuff_t *tvb, gint offset, proto_tree *tree, guint32 access)
{
- proto_tree_add_boolean(tree, hf_ldap_AccessMask_ADS_CONTROL_ACCESS, tvb, offset, 4, access);
-
- proto_tree_add_boolean(tree, hf_ldap_AccessMask_ADS_LIST_OBJECT, tvb, offset, 4, access);
-
- proto_tree_add_boolean(tree, hf_ldap_AccessMask_ADS_DELETE_TREE, tvb, offset, 4, access);
-
- proto_tree_add_boolean(tree, hf_ldap_AccessMask_ADS_WRITE_PROP, tvb, offset, 4, access);
-
- proto_tree_add_boolean(tree, hf_ldap_AccessMask_ADS_READ_PROP, tvb, offset, 4, access);
-
- proto_tree_add_boolean(tree, hf_ldap_AccessMask_ADS_SELF_WRITE, tvb, offset, 4, access);
-
- proto_tree_add_boolean(tree, hf_ldap_AccessMask_ADS_LIST, tvb, offset, 4, access);
-
- proto_tree_add_boolean(tree, hf_ldap_AccessMask_ADS_DELETE_CHILD, tvb, offset, 4, access);
+ static const int * access_flags[] = {
+ &hf_ldap_AccessMask_ADS_CONTROL_ACCESS,
+ &hf_ldap_AccessMask_ADS_LIST_OBJECT,
+ &hf_ldap_AccessMask_ADS_DELETE_TREE,
+ &hf_ldap_AccessMask_ADS_WRITE_PROP,
+ &hf_ldap_AccessMask_ADS_READ_PROP,
+ &hf_ldap_AccessMask_ADS_SELF_WRITE,
+ &hf_ldap_AccessMask_ADS_LIST,
+ &hf_ldap_AccessMask_ADS_DELETE_CHILD,
+ &hf_ldap_AccessMask_ADS_CREATE_CHILD,
+ NULL
+ };
- proto_tree_add_boolean(tree, hf_ldap_AccessMask_ADS_CREATE_CHILD, tvb, offset, 4, access);
+ proto_tree_add_bitmask_list_value(tree, tvb, offset, 4, access_flags, access);
}
struct access_mask_info ldap_access_mask_info = {
"LDAP", /* Name of specific rights */