aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStig Bjørlykke <stig@bjorlykke.org>2015-12-16 12:18:01 +0100
committerMichael Mann <mmann78@netscape.net>2015-12-16 21:51:31 +0000
commitb55d1b5e1f95defec4d624f8378a5d824917128d (patch)
tree75bb836f36b49e32bacadba438f326ad9f9ea56f
parent2943ac5381ed424348c66db76cd6869dbdf71710 (diff)
ldap: Add inetOrgPerson from RFC2798.
Change-Id: I3e2e3143f66db62c416fd7031d290e2a5b21fa93 Reviewed-on: https://code.wireshark.org/review/12677 Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
-rw-r--r--asn1/ldap/packet-ldap-template.c3
-rw-r--r--epan/dissectors/packet-ldap.c5
2 files changed, 7 insertions, 1 deletions
diff --git a/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c
index c3777fb773..4b94b08171 100644
--- a/asn1/ldap/packet-ldap-template.c
+++ b/asn1/ldap/packet-ldap-template.c
@@ -2343,6 +2343,9 @@ proto_reg_handoff_ldap(void)
oid_add_from_string("LDAP_SERVER_SHUTDOWN_NOTIFY_OID","1.2.840.113556.1.4.1907");
oid_add_from_string("LDAP_SERVER_RANGE_RETRIEVAL_NOERR_OID","1.2.840.113556.1.4.1948");
+ /* RFC2798 */
+ oid_add_from_string("inetOrgPerson","2.16.840.1.113730.3.2.2");
+
dissector_add_string("ldap.name", "netlogon", create_dissector_handle(dissect_NetLogon_PDU, proto_cldap));
dissector_add_string("ldap.name", "objectGUID", create_dissector_handle(dissect_ldap_guid, proto_ldap));
dissector_add_string("ldap.name", "supportedControl", create_dissector_handle(dissect_ldap_oid, proto_ldap));
diff --git a/epan/dissectors/packet-ldap.c b/epan/dissectors/packet-ldap.c
index 88314a3280..3eb9607e7e 100644
--- a/epan/dissectors/packet-ldap.c
+++ b/epan/dissectors/packet-ldap.c
@@ -5891,6 +5891,9 @@ proto_reg_handoff_ldap(void)
oid_add_from_string("LDAP_SERVER_SHUTDOWN_NOTIFY_OID","1.2.840.113556.1.4.1907");
oid_add_from_string("LDAP_SERVER_RANGE_RETRIEVAL_NOERR_OID","1.2.840.113556.1.4.1948");
+ /* RFC2798 */
+ oid_add_from_string("inetOrgPerson","2.16.840.1.113730.3.2.2");
+
dissector_add_string("ldap.name", "netlogon", create_dissector_handle(dissect_NetLogon_PDU, proto_cldap));
dissector_add_string("ldap.name", "objectGUID", create_dissector_handle(dissect_ldap_guid, proto_ldap));
dissector_add_string("ldap.name", "supportedControl", create_dissector_handle(dissect_ldap_oid, proto_ldap));
@@ -5915,7 +5918,7 @@ proto_reg_handoff_ldap(void)
/*--- End of included file: packet-ldap-dis-tab.c ---*/
-#line 2354 "../../asn1/ldap/packet-ldap-template.c"
+#line 2357 "../../asn1/ldap/packet-ldap-template.c"
}