diff options
| author | Guy Harris <guy@alum.mit.edu> | 2012-05-08 00:15:53 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2012-05-08 00:15:53 +0000 |
| commit | 1fca484224eef7ce1714ef536d9947cf6d93cb85 (patch) | |
| tree | d9d24864750a8379650869b3fbb26434ee537849 /asn1/ldap | |
| parent | 551d8aaacfd852a456650b23e71bd31b07bdfec4 (diff) | |
Get rid of remaining Booleans-as-encoding-arguments in
proto_tree_add_item() calls.
Update the RFC number for LDAP.
svn path=/trunk/; revision=42493
Diffstat (limited to 'asn1/ldap')
| -rw-r--r-- | asn1/ldap/ldap.cnf | 2 | ||||
| -rw-r--r-- | asn1/ldap/packet-ldap-template.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/asn1/ldap/ldap.cnf b/asn1/ldap/ldap.cnf index 46e3a89650..77576d12d5 100644 --- a/asn1/ldap/ldap.cnf +++ b/asn1/ldap/ldap.cnf @@ -471,7 +471,7 @@ ldap_conv_info_t *ldap_info; /* first check if we have a custom attribute type configured */ if ((hf_id = get_hf_for_header (attr_type)) != NULL) - proto_tree_add_item (tree, *hf_id, next_tvb, 0, tvb_length_remaining(next_tvb, 0), FALSE); + proto_tree_add_item (tree, *hf_id, next_tvb, 0, tvb_length_remaining(next_tvb, 0), ENC_UTF_8|ENC_NA); /* if we have an attribute type that isn't binary see if there is a better dissector */ else if(!attr_type || !next_tvb || !dissector_try_string(ldap_name_dissector_table, attr_type, next_tvb, actx->pinfo, tree)) { diff --git a/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c index 60f57e2d8a..b0c49f4959 100644 --- a/asn1/ldap/packet-ldap-template.c +++ b/asn1/ldap/packet-ldap-template.c @@ -1,7 +1,7 @@ /* packet-ldap.c * Routines for ldap packet dissection * - * See RFC 1777 (LDAP v2), RFC 2251 (LDAP v3), and RFC 2222 (SASL). + * See RFC 1777 (LDAP v2), RFC 4511 (LDAP v3), and RFC 2222 (SASL). * * $Id$ * @@ -1083,7 +1083,7 @@ dissect_ldap_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean i ldap_found_in_frame = TRUE; } - ldap_item = proto_tree_add_item(tree, is_mscldap?proto_cldap:proto_ldap, tvb, 0, -1, FALSE); + ldap_item = proto_tree_add_item(tree, is_mscldap?proto_cldap:proto_ldap, tvb, 0, -1, ENC_NA); ldap_tree = proto_item_add_subtree(ldap_item, ett_ldap); /* |