disable atexit() handler until we have a

dlopen/dlclose() fix available.

diff --git a/CHANGES b/CHANGES
index 21e793cb2bcd86d5b014b2ddf31250a07758ba3c..ad218fd3417330ffc1a5b198a3899174273990e9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,7 @@ OpenLDAP 2.0 Change Log
 OpenLDAP 2.0.23 Engineering
        Fixed slapd moddn acl bug (ITS#1562) (ITS#1582)
        Fixed slapd acl regex (to dn="") portability bug (ITS#1579)
+       Disabled -lldap atexit() handler (ITS#1577)
        Documentation
                Fixed a number of typos (ITS#1578)
 

diff --git a/build/version b/build/version
index 3e61af0c59ce2c7a6ad183ca971cf937e7a19790..3cf5c83cc0964d156c42d1bcebcece1fcad75b0f 100644 (file)
--- a/build/version
+++ b/build/version
@@ -1 +1 @@
-2.0.23-Release
+2.0.23-Engineering

diff --git a/libraries/libldap/init.c b/libraries/libldap/init.c
index 4809fdd00c3583b275fb71b3511e6980873d9568..dea29f67d3bb6f65d92898db3a86d3fa19ae8ede 100644 (file)
--- a/libraries/libldap/init.c
+++ b/libraries/libldap/init.c
@@ -400,7 +400,10 @@ void ldap_int_initialize_global_options( struct ldapoptions *gopts, int *dbglvl
         */
        ldap_url_parselist(&gopts->ldo_defludp, "ldap://localhost/");
        gopts->ldo_defport = LDAP_PORT;
+
+#if 0 /* don't register atexit() handler... breaks dlopen() apps */
        atexit(ldap_int_destroy_global_options);
+#endif
 
        gopts->ldo_refhoplimit = LDAP_DEFAULT_REFHOPLIMIT;
        gopts->ldo_rebindproc = NULL;