the ldap values for supportedControl and supportedCapabilities is an oid in ascii format.

resolve it into a anme if possible and present it.




svn path=/trunk/; revision=18842

1 files changed, 26 insertions, 0 deletions

diff --git a/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c
index 3d2beec608..d4722c4a8c 100644
--- a/asn1/ldap/packet-ldap-template.c
+++ b/asn1/ldap/packet-ldap-template.c
@@ -1172,6 +1172,30 @@ dissect_normal_ldap_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 }
 
 static void
+dissect_ldap_oid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
+{
+	char *oid, *oidname;
+
+	/* tvb here contains an ascii string that is really an oid */
+/* XXX   we should convert the string oid into a real oid so we can use
+ *       proto_tree_add_oid() instead.
+ */
+
+	oid=tvb_get_ephemeral_string(tvb, 0, tvb_length(tvb));
+	if(!oid){
+		return;
+	}
+
+	oidname=get_oid_str_name(oid);
+
+	if(oidname){
+		proto_tree_add_text(tree, tvb, 0, tvb_length(tvb), "OID: %s (%s)",oid,oidname);
+	} else {
+		proto_tree_add_text(tree, tvb, 0, tvb_length(tvb), "OID: %s",oid);
+	}
+}
+
+static void
 dissect_ldap_guid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
 {
 	guint8 drep[4] = { 0x10, 0x00, 0x00, 0x00}; /* fake DREP struct */
@@ -1529,6 +1553,8 @@ proto_reg_handoff_ldap(void)
 
 	register_ldap_name_dissector("netlogon", dissect_NetLogon_PDU, proto_cldap);
 	register_ldap_name_dissector("objectGUID", dissect_ldap_guid, proto_ldap);
+	register_ldap_name_dissector("supportedControl", dissect_ldap_oid, proto_ldap);
+	register_ldap_name_dissector("supportedCapabilities", dissect_ldap_oid, proto_ldap);
 }