Remove the LDAP wrapping for registering dissectors and just use dissector_add_string directly.

Change-Id: I307ee31562a5a84bc62691f367e3b8df3cb3f244
Reviewed-on: https://code.wireshark.org/review/12097
Petri-Dish: Michael Mann <mmann78@netscape.net>
Reviewed-by: Michael Mann <mmann78@netscape.net>

3 files changed, 13 insertions, 42 deletions

diff --git a/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c
index 736d6be206..4c70543007 100644
--- a/asn1/ldap/packet-ldap-template.c
+++ b/asn1/ldap/packet-ldap-template.c
@@ -1913,31 +1913,6 @@ ldap_cleanup(void)
   ldap_info_items = NULL;
 }
 
-void
-register_ldap_name_dissector_handle(const char *attr_type_p, dissector_handle_t dissector)
-{
-	dissector_add_string("ldap.name", attr_type_p, dissector);
-}
-
-void
-register_ldap_name_dissector(const char *attr_type_p, dissector_t dissector, int proto)
-{
-	dissector_handle_t dissector_handle;
-
-	dissector_handle=create_dissector_handle(dissector, proto);
-	register_ldap_name_dissector_handle(attr_type_p, dissector_handle);
-}
-
-void
-new_register_ldap_name_dissector(const char *attr_type_p, new_dissector_t dissector, int proto)
-{
-        dissector_handle_t dissector_handle;
-
-        dissector_handle=new_create_dissector_handle(dissector, proto);
-        register_ldap_name_dissector_handle(attr_type_p, dissector_handle);
-}
-
-
 /*--- proto_register_ldap -------------------------------------------*/
 void proto_register_ldap(void) {
 
@@ -2369,12 +2344,12 @@ 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");
 
-	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);
-	register_ldap_name_dissector("objectSid", dissect_ldap_sid, proto_ldap);
-	register_ldap_name_dissector("nTSecurityDescriptor", dissect_ldap_nt_sec_desc, proto_ldap);
+	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));
+	dissector_add_string("ldap.name", "supportedCapabilities", create_dissector_handle(dissect_ldap_oid, proto_ldap));
+	dissector_add_string("ldap.name", "objectSid", create_dissector_handle(dissect_ldap_sid, proto_ldap));
+	dissector_add_string("ldap.name", "nTSecurityDescriptor", create_dissector_handle(dissect_ldap_nt_sec_desc, proto_ldap));
 
 #include "packet-ldap-dis-tab.c"
 
diff --git a/asn1/ldap/packet-ldap-template.h b/asn1/ldap/packet-ldap-template.h
index 54803f0138..ff4dc6c8f2 100644
--- a/asn1/ldap/packet-ldap-template.h
+++ b/asn1/ldap/packet-ldap-template.h
@@ -99,10 +99,6 @@ typedef struct ldap_call_response {
   guint protocolOpTag;
 } ldap_call_response_t;
 
-void register_ldap_name_dissector_handle(const char *attr_type, dissector_handle_t dissector);
-void register_ldap_name_dissector(const char *attr_type, dissector_t dissector, int proto);
-void new_register_ldap_name_dissector(const char *attr_type, new_dissector_t dissector, int proto);
-
 WS_DLL_PUBLIC
 int dissect_mscldap_string(tvbuff_t *tvb, int offset, char *str, int max_len, gboolean prepend_dot _U_);
 
diff --git a/asn1/x509af/packet-x509af-template.c b/asn1/x509af/packet-x509af-template.c
index 5ce49b3312..2148bcab37 100644
--- a/asn1/x509af/packet-x509af-template.c
+++ b/asn1/x509af/packet-x509af-template.c
@@ -177,15 +177,15 @@ void proto_reg_handoff_x509af(void) {
 
 	/* these will generally be encoded as ";binary" in LDAP */
 
-	new_register_ldap_name_dissector("cACertificate", dissect_x509af_Certificate_PDU, proto_x509af);
-	new_register_ldap_name_dissector("userCertificate", dissect_x509af_Certificate_PDU, proto_x509af);
+	dissector_add_string("ldap.name", "cACertificate", new_create_dissector_handle(dissect_x509af_Certificate_PDU, proto_x509af));
+	dissector_add_string("ldap.name", "userCertificate", new_create_dissector_handle(dissect_x509af_Certificate_PDU, proto_x509af));
 
-	new_register_ldap_name_dissector("certificateRevocationList", dissect_CertificateList_PDU, proto_x509af);
-	new_register_ldap_name_dissector("crl", dissect_CertificateList_PDU, proto_x509af);
+	dissector_add_string("ldap.name", "certificateRevocationList", new_create_dissector_handle(dissect_CertificateList_PDU, proto_x509af));
+	dissector_add_string("ldap.name", "crl", new_create_dissector_handle(dissect_CertificateList_PDU, proto_x509af));
 
-	new_register_ldap_name_dissector("authorityRevocationList", dissect_CertificateList_PDU, proto_x509af);
-	new_register_ldap_name_dissector("arl", dissect_CertificateList_PDU, proto_x509af);
+	dissector_add_string("ldap.name", "authorityRevocationList", new_create_dissector_handle(dissect_CertificateList_PDU, proto_x509af));
+	dissector_add_string("ldap.name", "arl", new_create_dissector_handle(dissect_CertificateList_PDU, proto_x509af));
 
-	new_register_ldap_name_dissector("crossCertificatePair", dissect_CertificatePair_PDU, proto_x509af);
+	dissector_add_string("ldap.name", "crossCertificatePair", new_create_dissector_handle(dissect_CertificatePair_PDU, proto_x509af));
 }