Use oid_add_from_string for adding names.

fix compil of gsmmap and inap.
Note xcopy of gsmmap does not work(rename packet-gsm_map -> packet-gsmmap ?)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@23325 f5534014-38df-0310-8fa8-9805f1628bb7

1 files changed, 36 insertions, 36 deletions

diff --git a/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c
index 783d6b17e9..fffb339166 100644
--- a/asn1/ldap/packet-ldap-template.c
+++ b/asn1/ldap/packet-ldap-template.c
@@ -1690,42 +1690,42 @@ proto_reg_handoff_ldap(void)
 	ntlmssp_handle = find_dissector("ntlmssp");
 
 /*  http://msdn.microsoft.com/library/default.asp?url=/library/en-us/dsml/dsml/ldap_controls_and_session_support.asp */
-	add_oid_str_name("1.2.840.113556.1.4.319","LDAP_PAGED_RESULT_OID_STRING");
-	add_oid_str_name("1.2.840.113556.1.4.417","LDAP_SERVER_SHOW_DELETED_OID");
-	add_oid_str_name("1.2.840.113556.1.4.473","LDAP_SERVER_SORT_OID");
-	add_oid_str_name("1.2.840.113556.1.4.474","LDAP_CONTROL_SORT_RESP_OID");
-	add_oid_str_name("1.2.840.113556.1.4.521","LDAP_SERVER_CROSSDOM_MOVE_TARGET_OID");
-	add_oid_str_name("1.2.840.113556.1.4.528","LDAP_SERVER_NOTIFICATION_OID");
-	add_oid_str_name("1.2.840.113556.1.4.529","LDAP_SERVER_EXTENDED_DN_OID");
-	add_oid_str_name("1.2.840.113556.1.4.582","meetingAdvertiseScope");
-	add_oid_str_name("1.2.840.113556.1.4.619","LDAP_SERVER_LAZY_COMMIT_OID");
-	add_oid_str_name("1.2.840.113556.1.4.650","mhsORAddress");
-	add_oid_str_name("1.2.840.113556.1.4.654","managedObjects");
-	add_oid_str_name("1.2.840.113556.1.4.800","LDAP_CAP_ACTIVE_DIRECTORY_OID");
-	add_oid_str_name("1.2.840.113556.1.4.801","LDAP_SERVER_SD_FLAGS_OID");
-	add_oid_str_name("1.2.840.113556.1.4.804","LDAP_OID_COMPARATOR_OR");
-	add_oid_str_name("1.2.840.113556.1.4.805","LDAP_SERVER_TREE_DELETE_OID");
-	add_oid_str_name("1.2.840.113556.1.4.841","LDAP_SERVER_DIRSYNC_OID");
-	add_oid_str_name("1.2.840.113556.1.4.970 ","None");
-	add_oid_str_name("1.2.840.113556.1.4.1338","LDAP_SERVER_VERIFY_NAME_OID");
-	add_oid_str_name("1.2.840.113556.1.4.1339","LDAP_SERVER_DOMAIN_SCOPE_OID");
-	add_oid_str_name("1.2.840.113556.1.4.1340","LDAP_SERVER_SEARCH_OPTIONS_OID");
-	add_oid_str_name("1.2.840.113556.1.4.1413","LDAP_SERVER_PERMISSIVE_MODIFY_OID");
-	add_oid_str_name("1.2.840.113556.1.4.1504","LDAP_SERVER_ASQ_OID");
-	add_oid_str_name("1.2.840.113556.1.4.1670","LDAP_CAP_ACTIVE_DIRECTORY_V51_OID");
-	add_oid_str_name("1.2.840.113556.1.4.1781","LDAP_SERVER_FAST_BIND_OID");
-	add_oid_str_name("1.2.840.113556.1.4.1791","LDAP_CAP_ACTIVE_DIRECTORY_LDAP_INTEG_OID");
-	add_oid_str_name("1.2.840.113556.1.4.1840","msDS-ObjectReference");
-	add_oid_str_name("1.2.840.113556.1.4.1848","msDS-QuotaEffective");
-	add_oid_str_name("1.2.840.113556.1.4.1851","LDAP_CAP_ACTIVE_DIRECTORY_ADAM_OID");
-	add_oid_str_name("1.2.840.113556.1.4.1860","msDS-PortSSL");
-	add_oid_str_name("1.2.840.113556.1.4.1960","msDS-isRODC");
-	add_oid_str_name("1.2.840.113556.1.4.1711","msDS-SDReferenceDomain");
-	add_oid_str_name("1.2.840.113556.1.4.1717","msDS-AdditionalDnsHostName");
-	add_oid_str_name("1.3.6.1.4.1.1466.101.119.1","None");
-	add_oid_str_name("1.3.6.1.4.1.1466.20037","LDAP_START_TLS_OID");
-	add_oid_str_name("2.16.840.1.113730.3.4.9","LDAP_CONTROL_VLVREQUEST VLV");
-	add_oid_str_name("2.16.840.1.113730.3.4.10","LDAP_CONTROL_VLVRESPONSE VLV");
+	oid_add_from_string("LDAP_PAGED_RESULT_OID_STRING","1.2.840.113556.1.4.319");
+	oid_add_from_string("LDAP_SERVER_SHOW_DELETED_OID","1.2.840.113556.1.4.417");
+	oid_add_from_string("LDAP_SERVER_SORT_OID","1.2.840.113556.1.4.473");
+	oid_add_from_string("LDAP_CONTROL_SORT_RESP_OID","1.2.840.113556.1.4.474");
+	oid_add_from_string("LDAP_SERVER_CROSSDOM_MOVE_TARGET_OID","1.2.840.113556.1.4.521");
+	oid_add_from_string("LDAP_SERVER_NOTIFICATION_OID","1.2.840.113556.1.4.528");
+	oid_add_from_string("LDAP_SERVER_EXTENDED_DN_OID","1.2.840.113556.1.4.529");
+	oid_add_from_string("meetingAdvertiseScope","1.2.840.113556.1.4.582");
+	oid_add_from_string("LDAP_SERVER_LAZY_COMMIT_OID","1.2.840.113556.1.4.619");
+	oid_add_from_string("mhsORAddress","1.2.840.113556.1.4.650");
+	oid_add_from_string("managedObjects","1.2.840.113556.1.4.654");
+	oid_add_from_string("LDAP_CAP_ACTIVE_DIRECTORY_OID","1.2.840.113556.1.4.800");
+	oid_add_from_string("LDAP_SERVER_SD_FLAGS_OID","1.2.840.113556.1.4.801");
+	oid_add_from_string("LDAP_OID_COMPARATOR_OR","1.2.840.113556.1.4.804");
+	oid_add_from_string("LDAP_SERVER_TREE_DELETE_OID","1.2.840.113556.1.4.805");
+	oid_add_from_string("LDAP_SERVER_DIRSYNC_OID","1.2.840.113556.1.4.841");
+	oid_add_from_string("None","1.2.840.113556.1.4.970");
+	oid_add_from_string("LDAP_SERVER_VERIFY_NAME_OID","1.2.840.113556.1.4.1338");
+	oid_add_from_string("LDAP_SERVER_DOMAIN_SCOPE_OID","1.2.840.113556.1.4.1339");
+	oid_add_from_string("LDAP_SERVER_SEARCH_OPTIONS_OID","1.2.840.113556.1.4.1340");
+	oid_add_from_string("LDAP_SERVER_PERMISSIVE_MODIFY_OID","1.2.840.113556.1.4.1413");
+	oid_add_from_string("LDAP_SERVER_ASQ_OID","1.2.840.113556.1.4.1504");
+	oid_add_from_string("LDAP_CAP_ACTIVE_DIRECTORY_V51_OID","1.2.840.113556.1.4.1670");
+	oid_add_from_string("LDAP_SERVER_FAST_BIND_OID","1.2.840.113556.1.4.1781");
+	oid_add_from_string("LDAP_CAP_ACTIVE_DIRECTORY_LDAP_INTEG_OID","1.2.840.113556.1.4.1791");
+	oid_add_from_string("msDS-ObjectReference","1.2.840.113556.1.4.1840");
+	oid_add_from_string("msDS-QuotaEffective","1.2.840.113556.1.4.1848");
+	oid_add_from_string("LDAP_CAP_ACTIVE_DIRECTORY_ADAM_OID","1.2.840.113556.1.4.1851");
+	oid_add_from_string("msDS-PortSSL","1.2.840.113556.1.4.1860");
+	oid_add_from_string("msDS-isRODC","1.2.840.113556.1.4.1960");
+	oid_add_from_string("msDS-SDReferenceDomain","1.2.840.113556.1.4.1711");
+	oid_add_from_string("msDS-AdditionalDnsHostName","1.2.840.113556.1.4.1717");
+	oid_add_from_string("None","1.3.6.1.4.1.1466.101.119.1");
+	oid_add_from_string("LDAP_START_TLS_OID","1.3.6.1.4.1.1466.20037");
+	oid_add_from_string("LDAP_CONTROL_VLVREQUEST VLV","2.16.840.1.113730.3.4.9");
+	oid_add_from_string("LDAP_CONTROL_VLVRESPONSE VLV","2.16.840.1.113730.3.4.10");
 
 	register_ldap_name_dissector("netlogon", dissect_NetLogon_PDU, proto_cldap);
 	register_ldap_name_dissector("objectGUID", dissect_ldap_guid, proto_ldap);