ITS#9673 - Start fully tracking symbols for versioning

diff --git a/build/version.sh b/build/version.sh
index 455b4e831d6105122872dbafc962740067487472..799a33ca347fee15e69d42ebcabcd9828ea876f3 100755 (executable)
--- a/build/version.sh
+++ b/build/version.sh
@@ -34,7 +34,6 @@ echo OL_PACKAGE=\"${ol_package}\"
 echo OL_MAJOR=$ol_major
 echo OL_MINOR=$ol_minor
 echo OL_PATCH=$ol_patch
-echo OL_API_CURRENT=$ol_api_current
 echo OL_API_INC=$ol_api_inc
 echo OL_API_LIB_VERSION=$ol_api_lib_version
 echo OL_VERSION=$ol_version

diff --git a/configure.ac b/configure.ac
index a142d06be7fd14b99e7c6b37a1f522beb52f9b7c..a0879bc38cef5ec496baf18c66d4038bcf25368b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -82,9 +82,6 @@ AC_DEFINE_UNQUOTED(LDAP_VENDOR_VERSION_MAJOR,$OL_MAJOR,Major)
 AC_DEFINE_UNQUOTED(LDAP_VENDOR_VERSION_MINOR,$OL_MINOR,Minor)
 AC_DEFINE_UNQUOTED(LDAP_VENDOR_VERSION_PATCH,$OL_PATCH,Patch)
 
-OPENLDAP_API_CURRENT=$OL_API_CURRENT
-AC_SUBST(OPENLDAP_API_CURRENT)dnl
-
 OPENLDAP_LIBVERSION=$OL_API_LIB_VERSION
 AC_SUBST(OPENLDAP_LIBVERSION)dnl
 
@@ -3219,10 +3216,8 @@ AC_CONFIG_FILES([Makefile:build/top.mk:Makefile.in:build/dir.mk]
 [libraries/Makefile:build/top.mk:libraries/Makefile.in:build/dir.mk]
 [libraries/liblber/Makefile:build/top.mk:libraries/liblber/Makefile.in:build/lib.mk:build/lib-shared.mk]
 [libraries/liblber/lber.pc]
-[libraries/liblber/liblber.vers]
 [libraries/libldap/Makefile:build/top.mk:libraries/libldap/Makefile.in:build/lib.mk:build/lib-shared.mk]
 [libraries/libldap/ldap.pc]
-[libraries/libldap/libldap.vers]
 [libraries/liblunicode/Makefile:build/top.mk:libraries/liblunicode/Makefile.in:build/lib.mk:build/lib-static.mk]
 [libraries/liblutil/Makefile:build/top.mk:libraries/liblutil/Makefile.in:build/lib.mk:build/lib-static.mk]
 [libraries/librewrite/Makefile:build/top.mk:libraries/librewrite/Makefile.in:build/lib.mk:build/lib-static.mk]

diff --git a/libraries/liblber/Makefile.in b/libraries/liblber/Makefile.in
index b19284aabeee6342dcc48cd7939c74cc362706d4..42538bfce3b40413112919c80db71eb1cb2d6019 100644 (file)
--- a/libraries/liblber/Makefile.in
+++ b/libraries/liblber/Makefile.in
@@ -39,7 +39,7 @@ XXLIBS =
 NT_LINK_LIBS = $(AC_LIBS)
 UNIX_LINK_LIBS = $(AC_LIBS)
 ifneq (,$(OL_VERSIONED_SYMBOLS))
-       SYMBOL_VERSION_FLAGS=$(OL_VERSIONED_SYMBOLS)$(LDAP_LIBDIR)/liblber/liblber.vers
+       SYMBOL_VERSION_FLAGS=$(OL_VERSIONED_SYMBOLS)$(srcdir)/lber.map
 endif
 
 dtest:    $(XLIBS) dtest.o

diff --git a/libraries/liblber/lber.map b/libraries/liblber/lber.map
new file mode 100644 (file)
index 0000000..9a4094b
--- /dev/null
+++ b/libraries/liblber/lber.map
@@ -0,0 +1,143 @@
+OPENLDAP_2.200
+{
+  global:
+    ber_alloc;
+    ber_alloc_t;
+    ber_bprint;
+    ber_bvarray_add;
+    ber_bvarray_add_x;
+    ber_bvarray_dup_x;
+    ber_bvarray_free;
+    ber_bvarray_free_x;
+    ber_bvdup;
+    ber_bvecadd;
+    ber_bvecadd_x;
+    ber_bvecfree;
+    ber_bvecfree_x;
+    ber_bvfree;
+    ber_bvfree_x;
+    ber_bvreplace;
+    ber_bvreplace_x;
+    ber_decode_int;
+    ber_decode_oid;
+    ber_dump;
+    ber_dup;
+    ber_dupbv;
+    ber_dupbv_x;
+    ber_encode_oid;
+    ber_errno_addr;
+    ber_error_print;
+    ber_first_element;
+    ber_flatten2;
+    ber_flatten;
+    ber_flush2;
+    ber_flush;
+    ber_free;
+    ber_free_buf;
+    ber_get_bitstringa;
+    ber_get_boolean;
+    ber_get_enum;
+    ber_get_int;
+    ber_get_next;
+    ber_get_null;
+    ber_get_option;
+    ber_get_stringa;
+    ber_get_stringa_null;
+    ber_get_stringal;
+    ber_get_stringb;
+    ber_get_stringbv;
+    ber_get_stringbv_null;
+    ber_get_tag;
+    ber_init2;
+    ber_init;
+    ber_init_w_nullc;
+    ber_int_errno_fn;
+    ber_int_log_proc;
+    ber_int_memory_fns;
+    ber_int_options;
+    ber_int_sb_close;
+    ber_int_sb_destroy;
+    ber_int_sb_init;
+    ber_int_sb_read;
+    ber_int_sb_write;
+    ber_len;
+    ber_log_bprint;
+    ber_log_dump;
+    ber_log_sos_dump;
+    ber_mem2bv;
+    ber_mem2bv_x;
+    ber_memalloc;
+    ber_memalloc_x;
+    ber_memcalloc;
+    ber_memcalloc_x;
+    ber_memfree;
+    ber_memfree_x;
+    ber_memrealloc;
+    ber_memrealloc_x;
+    ber_memvfree;
+    ber_memvfree_x;
+    ber_next_element;
+    ber_peek_element;
+    ber_peek_tag;
+    ber_printf;
+    ber_ptrlen;
+    ber_put_berval;
+    ber_put_bitstring;
+    ber_put_boolean;
+    ber_put_enum;
+    ber_put_int;
+    ber_put_null;
+    ber_put_ostring;
+    ber_put_seq;
+    ber_put_set;
+    ber_put_string;
+    ber_pvt_err_file;
+    ber_pvt_log_output;
+    ber_pvt_log_print;
+    ber_pvt_log_printf;
+    ber_pvt_opt_on;
+    ber_pvt_sb_buf_destroy;
+    ber_pvt_sb_buf_init;
+    ber_pvt_sb_copy_out;
+    ber_pvt_sb_do_write;
+    ber_pvt_sb_grow_buffer;
+    ber_pvt_socket_set_nonblock;
+    ber_read;
+    ber_realloc;
+    ber_remaining;
+    ber_reset;
+    ber_rewind;
+    ber_scanf;
+    ber_set_option;
+    ber_skip_data;
+    ber_skip_element;
+    ber_skip_raw;
+    ber_skip_tag;
+    ber_sockbuf_add_io;
+    ber_sockbuf_alloc;
+    ber_sockbuf_ctrl;
+    ber_sockbuf_free;
+    ber_sockbuf_io_debug;
+    ber_sockbuf_io_fd;
+    ber_sockbuf_io_readahead;
+    ber_sockbuf_io_tcp;
+    ber_sockbuf_remove_io;
+    ber_sos_dump;
+    ber_start;
+    ber_start_seq;
+    ber_start_set;
+    ber_str2bv;
+    ber_str2bv_x;
+    ber_strdup;
+    ber_strdup_x;
+    ber_strndup;
+    ber_strndup_x;
+    ber_strnlen;
+    ber_write;
+    der_alloc;
+    lutil_debug;
+    lutil_debug_file;
+  local:
+    *;
+};
+

diff --git a/libraries/liblber/liblber.vers.in b/libraries/liblber/liblber.vers.in
deleted file mode 100644 (file)
index ce0aeeb..0000000
--- a/libraries/liblber/liblber.vers.in
+++ /dev/null
@@ -1,17 +0,0 @@
-HIDDEN
-{
-  local:
-    __*;
-    _rest*;
-    _save*;
-};
-
-OPENLDAP_@OPENLDAP_API_CURRENT@
-{
-  global:
-    ber_*;
-    der_alloc*;
-    lutil_*;
-  local: *;
-};
-

diff --git a/libraries/libldap/Makefile.in b/libraries/libldap/Makefile.in
index fd08b3a036dc0d190b6cdd6bcb7289b87ad84f4f..0579c18a1ac83235fdfda8120dcaa0b3bcd8d841 100644 (file)
--- a/libraries/libldap/Makefile.in
+++ b/libraries/libldap/Makefile.in
@@ -59,7 +59,7 @@ XXLIBS = $(SECURITY_LIBS) $(LUTIL_LIBS)
 NT_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS)
 UNIX_LINK_LIBS = $(LDAP_LIBLBER_LA) $(AC_LIBS) $(SECURITY_LIBS) $(LTHREAD_LIBS)
 ifneq (,$(OL_VERSIONED_SYMBOLS))
-       SYMBOL_VERSION_FLAGS=$(OL_VERSIONED_SYMBOLS)$(LDAP_LIBDIR)/libldap/libldap.vers
+       SYMBOL_VERSION_FLAGS=$(OL_VERSIONED_SYMBOLS)$(srcdir)/ldap.map
 endif
 
 apitest:       $(XLIBS) apitest.o

diff --git a/libraries/libldap/ldap.map b/libraries/libldap/ldap.map
new file mode 100644 (file)
index 0000000..b28c9c2
--- /dev/null
+++ b/libraries/libldap/ldap.map
@@ -0,0 +1,575 @@
+OPENLDAP_2.200
+{
+  global:
+    ldap_X509dn2bv;
+    ldap_abandon;
+    ldap_abandon_ext;
+    ldap_add;
+    ldap_add_ext;
+    ldap_add_ext_s;
+    ldap_add_result_entry;
+    ldap_add_s;
+    ldap_alloc_ber_with_options;
+    ldap_append_referral;
+    ldap_attributetype2bv;
+    ldap_attributetype2name;
+    ldap_attributetype2str;
+    ldap_attributetype_free;
+    ldap_avl_apply;
+    ldap_avl_delete;
+    ldap_avl_dup_error;
+    ldap_avl_dup_ok;
+    ldap_avl_find2;
+    ldap_avl_find;
+    ldap_avl_find_lin;
+    ldap_avl_free;
+    ldap_avl_getfirst;
+    ldap_avl_getnext;
+    ldap_avl_insert;
+    ldap_avl_prefixapply;
+    ldap_bind;
+    ldap_bind_s;
+    ldap_build_add_req;
+    ldap_build_bind_req;
+    ldap_build_compare_req;
+    ldap_build_delete_req;
+    ldap_build_extended_req;
+    ldap_build_moddn_req;
+    ldap_build_modify_req;
+    ldap_build_search_req;
+    ldap_bv2dn;
+    ldap_bv2dn_x;
+    ldap_bv2escaped_filter_value;
+    ldap_bv2escaped_filter_value_len;
+    ldap_bv2escaped_filter_value_x;
+    ldap_bv2rdn;
+    ldap_bv2rdn_x;
+    ldap_cancel;
+    ldap_cancel_s;
+    ldap_charray2str;
+    ldap_charray_add;
+    ldap_charray_dup;
+    ldap_charray_free;
+    ldap_charray_inlist;
+    ldap_charray_merge;
+    ldap_chase_referrals;
+    ldap_chase_v3referrals;
+    ldap_clear_select_write;
+    ldap_compare;
+    ldap_compare_ext;
+    ldap_compare_ext_s;
+    ldap_compare_s;
+    ldap_connect;
+    ldap_connect_to_host;
+    ldap_connect_to_path;
+    ldap_contentrule2bv;
+    ldap_contentrule2name;
+    ldap_contentrule2str;
+    ldap_contentrule_free;
+    ldap_control_create;
+    ldap_control_dup;
+    ldap_control_find;
+    ldap_control_free;
+    ldap_controls_dup;
+    ldap_controls_free;
+    ldap_count_entries;
+    ldap_count_messages;
+    ldap_count_references;
+    ldap_count_values;
+    ldap_count_values_len;
+    ldap_create;
+    ldap_create_accountusability_control;
+    ldap_create_assertion_control;
+    ldap_create_assertion_control_value;
+    ldap_create_control;
+    ldap_create_deref_control;
+    ldap_create_deref_control_value;
+    ldap_create_dirsync_control;
+    ldap_create_dirsync_value;
+    ldap_create_extended_dn_control;
+    ldap_create_extended_dn_value;
+    ldap_create_page_control;
+    ldap_create_page_control_value;
+    ldap_create_passwordpolicy_control;
+    ldap_create_persistentsearch_control;
+    ldap_create_persistentsearch_control_value;
+    ldap_create_server_notification_control;
+    ldap_create_session_tracking_control;
+    ldap_create_session_tracking_value;
+    ldap_create_show_deleted_control;
+    ldap_create_sort_control;
+    ldap_create_sort_control_value;
+    ldap_create_sort_keylist;
+    ldap_create_vlv_control;
+    ldap_create_vlv_control_value;
+    ldap_dcedn2dn;
+    ldap_delete;
+    ldap_delete_ext;
+    ldap_delete_ext_s;
+    ldap_delete_result_entry;
+    ldap_delete_s;
+    ldap_derefresponse_free;
+    ldap_destroy;
+    ldap_dn2ad_canonical;
+    ldap_dn2bv;
+    ldap_dn2bv_x;
+    ldap_dn2dcedn;
+    ldap_dn2domain;
+    ldap_dn2str;
+    ldap_dn2ufn;
+    ldap_dn_normalize;
+    ldap_dnfree;
+    ldap_dnfree_x;
+    ldap_do_free_request;
+    ldap_domain2dn;
+    ldap_domain2hostlist;
+    ldap_dump_connection;
+    ldap_dump_requests_and_responses;
+    ldap_dup;
+    ldap_err2string;
+    ldap_explode_dn;
+    ldap_explode_rdn;
+    ldap_extended_operation;
+    ldap_extended_operation_s;
+    ldap_find_control;
+    ldap_find_request_by_msgid;
+    ldap_first_attribute;
+    ldap_first_entry;
+    ldap_first_message;
+    ldap_first_reference;
+    ldap_free_connection;
+    ldap_free_request;
+    ldap_free_select_info;
+    ldap_free_sort_keylist;
+    ldap_free_urldesc;
+    ldap_free_urllist;
+    ldap_get_attribute_ber;
+    ldap_get_dn;
+    ldap_get_dn_ber;
+    ldap_get_entry_controls;
+    ldap_get_message_ber;
+    ldap_get_option;
+    ldap_get_values;
+    ldap_get_values_len;
+    ldap_host_connected_to;
+    ldap_init;
+    ldap_init_fd;
+    ldap_initialize;
+    ldap_install_tls;
+    ldap_int_bisect_delete;
+    ldap_int_bisect_find;
+    ldap_int_bisect_insert;
+    ldap_int_check_async_open;
+    ldap_int_client_controls;
+    ldap_int_connect_cbs;
+    ldap_int_decode_b64_inplace;
+    ldap_int_error_init;
+    ldap_int_flush_request;
+    ldap_int_global_options;
+    ldap_int_hostname;
+    ldap_int_hostname_mutex;
+    ldap_int_inet4or6;
+    ldap_int_initialize;
+    ldap_int_initialize_global_options;
+    ldap_int_msgtype2str;
+    ldap_int_open_connection;
+    ldap_int_parse_numericoid;
+    ldap_int_parse_ruleid;
+    ldap_int_poll;
+    ldap_int_put_controls;
+    ldap_int_resolv_mutex;
+    ldap_int_sasl_bind;
+    ldap_int_sasl_close;
+    ldap_int_sasl_config;
+    ldap_int_sasl_external;
+    ldap_int_sasl_get_option;
+    ldap_int_sasl_init;
+    ldap_int_sasl_open;
+    ldap_int_sasl_set_option;
+    ldap_int_select;
+    ldap_int_stackguard;
+    ldap_int_thread_destroy;
+    ldap_int_thread_initialize;
+    ldap_int_thread_pool_shutdown;
+    ldap_int_thread_pool_startup;
+    ldap_int_timeval_dup;
+    ldap_int_tls_destroy;
+    ldap_int_tls_impl;
+    ldap_int_tls_start;
+    ldap_int_utils_init;
+    ldap_is_ldap_url;
+    ldap_is_ldapi_url;
+    ldap_is_ldaps_url;
+    ldap_is_read_ready;
+    ldap_is_write_ready;
+    ldap_ld_free;
+    ldap_ldif_record_done;
+    ldap_log_printf;
+    ldap_mark_select_clear;
+    ldap_mark_select_read;
+    ldap_mark_select_write;
+    ldap_matchingrule2bv;
+    ldap_matchingrule2name;
+    ldap_matchingrule2str;
+    ldap_matchingrule_free;
+    ldap_matchingruleuse2bv;
+    ldap_matchingruleuse2name;
+    ldap_matchingruleuse2str;
+    ldap_matchingruleuse_free;
+    ldap_memalloc;
+    ldap_memcalloc;
+    ldap_memfree;
+    ldap_memrealloc;
+    ldap_memvfree;
+    ldap_modify;
+    ldap_modify_ext;
+    ldap_modify_ext_s;
+    ldap_modify_s;
+    ldap_modrdn2;
+    ldap_modrdn2_s;
+    ldap_modrdn;
+    ldap_modrdn_s;
+    ldap_mods_free;
+    ldap_msgdelete;
+    ldap_msgfree;
+    ldap_msgid;
+    ldap_msgtype;
+    ldap_nameform2bv;
+    ldap_nameform2name;
+    ldap_nameform2str;
+    ldap_nameform_free;
+    ldap_new_connection;
+    ldap_new_select_info;
+    ldap_next_attribute;
+    ldap_next_entry;
+    ldap_next_message;
+    ldap_next_reference;
+    ldap_objectclass2bv;
+    ldap_objectclass2name;
+    ldap_objectclass2str;
+    ldap_objectclass_free;
+    ldap_open;
+    ldap_open_defconn;
+    ldap_open_internal_connection;
+    ldap_parse_accountusability_control;
+    ldap_parse_deref_control;
+    ldap_parse_derefresponse_control;
+    ldap_parse_dirsync_control;
+    ldap_parse_entrychange_control;
+    ldap_parse_extended_result;
+    ldap_parse_intermediate;
+    ldap_parse_ldif_record;
+    ldap_parse_ldif_record_x;
+    ldap_parse_page_control;
+    ldap_parse_pageresponse_control;
+    ldap_parse_passwd;
+    ldap_parse_password_expiring_control;
+    ldap_parse_passwordpolicy_control;
+    ldap_parse_reference;
+    ldap_parse_refresh;
+    ldap_parse_result;
+    ldap_parse_sasl_bind_result;
+    ldap_parse_session_tracking_control;
+    ldap_parse_sortresponse_control;
+    ldap_parse_verify_credentials;
+    ldap_parse_vlvresponse_control;
+    ldap_parse_whoami;
+    ldap_passwd;
+    ldap_passwd_s;
+    ldap_passwordpolicy_err2txt;
+    ldap_perror;
+    ldap_put_vrFilter;
+    ldap_pvt_bv2scope;
+    ldap_pvt_conf_option;
+    ldap_pvt_csnstr;
+    ldap_pvt_ctime;
+    ldap_pvt_discard;
+    ldap_pvt_filter_value_unescape;
+    ldap_pvt_find_wildcard;
+    ldap_pvt_get_controls;
+    ldap_pvt_get_fqdn;
+    ldap_pvt_get_hname;
+    ldap_pvt_gethostbyaddr_a;
+    ldap_pvt_gethostbyname_a;
+    ldap_pvt_gettime;
+    ldap_pvt_hex_unescape;
+    ldap_pvt_put_control;
+    ldap_pvt_put_filter;
+    ldap_pvt_runqueue_find;
+    ldap_pvt_runqueue_insert;
+    ldap_pvt_runqueue_isrunning;
+    ldap_pvt_runqueue_next_sched;
+    ldap_pvt_runqueue_persistent_backload;
+    ldap_pvt_runqueue_remove;
+    ldap_pvt_runqueue_resched;
+    ldap_pvt_runqueue_runtask;
+    ldap_pvt_runqueue_stoptask;
+    ldap_pvt_sasl_cbinding;
+    ldap_pvt_sasl_cbinding_parse;
+    ldap_pvt_sasl_generic_install;
+    ldap_pvt_sasl_generic_remove;
+    ldap_pvt_sasl_getmechs;
+    ldap_pvt_sasl_install;
+    ldap_pvt_sasl_mutex_dispose;
+    ldap_pvt_sasl_mutex_lock;
+    ldap_pvt_sasl_mutex_new;
+    ldap_pvt_sasl_mutex_unlock;
+    ldap_pvt_sasl_remove;
+    ldap_pvt_sasl_secprops;
+    ldap_pvt_sasl_secprops_unparse;
+    ldap_pvt_scope2bv;
+    ldap_pvt_scope2str;
+    ldap_pvt_search;
+    ldap_pvt_search_s;
+    ldap_pvt_sockaddrstr;
+    ldap_pvt_sockbuf_io_sasl_generic;
+    ldap_pvt_str2lower;
+    ldap_pvt_str2lowerbv;
+    ldap_pvt_str2scope;
+    ldap_pvt_str2upper;
+    ldap_pvt_str2upperbv;
+    ldap_pvt_strtok;
+    ldap_pvt_thread_cond_broadcast;
+    ldap_pvt_thread_cond_destroy;
+    ldap_pvt_thread_cond_init;
+    ldap_pvt_thread_cond_signal;
+    ldap_pvt_thread_cond_wait;
+    ldap_pvt_thread_create;
+    ldap_pvt_thread_destroy;
+    ldap_pvt_thread_exit;
+    ldap_pvt_thread_get_concurrency;
+    ldap_pvt_thread_initialize;
+    ldap_pvt_thread_join;
+    ldap_pvt_thread_key_create;
+    ldap_pvt_thread_key_destroy;
+    ldap_pvt_thread_key_getdata;
+    ldap_pvt_thread_key_setdata;
+    ldap_pvt_thread_kill;
+    ldap_pvt_thread_mutex_destroy;
+    ldap_pvt_thread_mutex_init;
+    ldap_pvt_thread_mutex_lock;
+    ldap_pvt_thread_mutex_recursive_init;
+    ldap_pvt_thread_mutex_trylock;
+    ldap_pvt_thread_mutex_unlock;
+    ldap_pvt_thread_pool_backload;
+    ldap_pvt_thread_pool_close;
+    ldap_pvt_thread_pool_context;
+    ldap_pvt_thread_pool_context_reset;
+    ldap_pvt_thread_pool_destroy;
+    ldap_pvt_thread_pool_free;
+    ldap_pvt_thread_pool_getkey;
+    ldap_pvt_thread_pool_idle;
+    ldap_pvt_thread_pool_init;
+    ldap_pvt_thread_pool_init_q;
+    ldap_pvt_thread_pool_maxthreads;
+    ldap_pvt_thread_pool_pause;
+    ldap_pvt_thread_pool_pausecheck_native;
+    ldap_pvt_thread_pool_pausequery;
+    ldap_pvt_thread_pool_pausewait;
+    ldap_pvt_thread_pool_pausing;
+    ldap_pvt_thread_pool_purgekey;
+    ldap_pvt_thread_pool_query;
+    ldap_pvt_thread_pool_queues;
+    ldap_pvt_thread_pool_resume;
+    ldap_pvt_thread_pool_retract;
+    ldap_pvt_thread_pool_setkey;
+    ldap_pvt_thread_pool_submit2;
+    ldap_pvt_thread_pool_submit;
+    ldap_pvt_thread_pool_tid;
+    ldap_pvt_thread_pool_unidle;
+    ldap_pvt_thread_pool_walk;
+    ldap_pvt_thread_rdwr_destroy;
+    ldap_pvt_thread_rdwr_init;
+    ldap_pvt_thread_rdwr_rlock;
+    ldap_pvt_thread_rdwr_rtrylock;
+    ldap_pvt_thread_rdwr_runlock;
+    ldap_pvt_thread_rdwr_wlock;
+    ldap_pvt_thread_rdwr_wtrylock;
+    ldap_pvt_thread_rdwr_wunlock;
+    ldap_pvt_thread_self;
+    ldap_pvt_thread_set_concurrency;
+    ldap_pvt_thread_sleep;
+    ldap_pvt_thread_yield;
+    ldap_pvt_tls_accept;
+    ldap_pvt_tls_check_hostname;
+    ldap_pvt_tls_config;
+    ldap_pvt_tls_connect;
+    ldap_pvt_tls_ctx_free;
+    ldap_pvt_tls_destroy;
+    ldap_pvt_tls_get_cipher;
+    ldap_pvt_tls_get_endpoint;
+    ldap_pvt_tls_get_my_dn;
+    ldap_pvt_tls_get_option;
+    ldap_pvt_tls_get_peer_dn;
+    ldap_pvt_tls_get_peercert;
+    ldap_pvt_tls_get_strength;
+    ldap_pvt_tls_get_unique;
+    ldap_pvt_tls_get_version;
+    ldap_pvt_tls_init;
+    ldap_pvt_tls_init_def_ctx;
+    ldap_pvt_tls_inplace;
+    ldap_pvt_tls_sb_ctx;
+    ldap_pvt_tls_set_option;
+    ldap_pvt_url_scheme2proto;
+    ldap_pvt_url_scheme2proxied;
+    ldap_pvt_url_scheme2tls;
+    ldap_pvt_url_scheme_port;
+    ldap_rdn2bv;
+    ldap_rdn2bv_x;
+    ldap_rdn2str;
+    ldap_rdnfree;
+    ldap_rdnfree_x;
+    ldap_refresh;
+    ldap_refresh_s;
+    ldap_rename2;
+    ldap_rename2_s;
+    ldap_rename;
+    ldap_rename_s;
+    ldap_req_cmp;
+    ldap_result2error;
+    ldap_result;
+    ldap_return_request;
+    ldap_sasl_bind;
+    ldap_sasl_bind_s;
+    ldap_sasl_interactive_bind;
+    ldap_sasl_interactive_bind_s;
+    ldap_scherr2str;
+    ldap_search;
+    ldap_search_ext;
+    ldap_search_ext_s;
+    ldap_search_s;
+    ldap_search_st;
+    ldap_send_initial_request;
+    ldap_send_server_request;
+    ldap_send_unbind;
+    ldap_set_ber_options;
+    ldap_set_nextref_proc;
+    ldap_set_option;
+    ldap_set_rebind_proc;
+    ldap_set_urllist_proc;
+    ldap_simple_bind;
+    ldap_simple_bind_s;
+    ldap_sort_entries;
+    ldap_sort_strcasecmp;
+    ldap_sort_values;
+    ldap_start_tls;
+    ldap_start_tls_s;
+    ldap_str2attributetype;
+    ldap_str2charray;
+    ldap_str2contentrule;
+    ldap_str2dn;
+    ldap_str2matchingrule;
+    ldap_str2matchingruleuse;
+    ldap_str2nameform;
+    ldap_str2objectclass;
+    ldap_str2rdn;
+    ldap_str2structurerule;
+    ldap_str2syntax;
+    ldap_strdup;
+    ldap_structurerule2bv;
+    ldap_structurerule2name;
+    ldap_structurerule2str;
+    ldap_structurerule_free;
+    ldap_sync_destroy;
+    ldap_sync_init;
+    ldap_sync_init_refresh_and_persist;
+    ldap_sync_init_refresh_only;
+    ldap_sync_initialize;
+    ldap_sync_poll;
+    ldap_syntax2bv;
+    ldap_syntax2name;
+    ldap_syntax2str;
+    ldap_syntax_free;
+    ldap_tavl_delete;
+    ldap_tavl_end;
+    ldap_tavl_find2;
+    ldap_tavl_find3;
+    ldap_tavl_find;
+    ldap_tavl_free;
+    ldap_tavl_insert;
+    ldap_tavl_next;
+    ldap_tls_inplace;
+    ldap_turn;
+    ldap_turn_s;
+    ldap_txn_end;
+    ldap_txn_end_s;
+    ldap_txn_start;
+    ldap_txn_start_s;
+    ldap_ucs_to_utf8s;
+    ldap_unbind;
+    ldap_unbind_ext;
+    ldap_unbind_ext_s;
+    ldap_unbind_s;
+    ldap_url_desc2str;
+    ldap_url_dup;
+    ldap_url_duplist;
+    ldap_url_list2hosts;
+    ldap_url_list2urls;
+    ldap_url_parse;
+    ldap_url_parse_ext;
+    ldap_url_parsehosts;
+    ldap_url_parselist;
+    ldap_url_parselist_ext;
+    ldap_utf8_bytes;
+    ldap_utf8_charlen2;
+    ldap_utf8_charlen;
+    ldap_utf8_chars;
+    ldap_utf8_copy;
+    ldap_utf8_isalnum;
+    ldap_utf8_isalpha;
+    ldap_utf8_isascii;
+    ldap_utf8_isdigit;
+    ldap_utf8_islower;
+    ldap_utf8_isspace;
+    ldap_utf8_isupper;
+    ldap_utf8_isxdigit;
+    ldap_utf8_lentab;
+    ldap_utf8_mintab;
+    ldap_utf8_next;
+    ldap_utf8_offset;
+    ldap_utf8_prev;
+    ldap_utf8_strchr;
+    ldap_utf8_strcspn;
+    ldap_utf8_strpbrk;
+    ldap_utf8_strspn;
+    ldap_utf8_strtok;
+    ldap_validate_and_fill_sourceip;
+    ldap_value_dup;
+    ldap_value_free;
+    ldap_value_free_len;
+    ldap_verify_credentials;
+    ldap_verify_credentials_s;
+    ldap_whoami;
+    ldap_whoami_s;
+    ldap_x_mb_to_utf8;
+    ldap_x_mbs_to_utf8s;
+    ldap_x_ucs4_to_utf8;
+    ldap_x_utf8_to_mb;
+    ldap_x_utf8_to_ucs4;
+    ldap_x_utf8_to_wc;
+    ldap_x_utf8s_to_mbs;
+    ldap_x_utf8s_to_wcs;
+    ldap_x_wc_to_utf8;
+    ldap_x_wcs_to_utf8s;
+    ldif_close;
+    ldif_countlines;
+    ldif_debug;
+    ldif_fetch_url;
+    ldif_getline;
+    ldif_is_not_printable;
+    ldif_must_b64_encode_register;
+    ldif_must_b64_encode_release;
+    ldif_open;
+    ldif_open_mem;
+    ldif_open_url;
+    ldif_parse_line2;
+    ldif_parse_line;
+    ldif_put;
+    ldif_put_wrap;
+    ldif_read_record;
+    ldif_sput;
+    ldif_sput_wrap;
+  local:
+    *;
+};
+

diff --git a/libraries/libldap/libldap.vers.in b/libraries/libldap/libldap.vers.in
deleted file mode 100644 (file)
index 1d0cbe4..0000000
--- a/libraries/libldap/libldap.vers.in
+++ /dev/null
@@ -1,16 +0,0 @@
-HIDDEN
-{
-  local:
-    __*;
-    _rest*;
-    _save*;
-};
-
-OPENLDAP_@OPENLDAP_API_CURRENT@
-{
-  global:
-    ldap_*;
-    ldif_*;
-  local: *;
-};
-