From: Kurt Zeilenga Date: Fri, 8 Feb 2002 20:08:59 +0000 (+0000) Subject: disable atexit() handler until we have a X-Git-Tag: OPENLDAP_REL_ENG_2_0_23~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85eebd09fb18d248f5efa6e343ee4cf58c3487c1;p=thirdparty%2Fopenldap.git disable atexit() handler until we have a dlopen/dlclose() fix available. --- diff --git a/CHANGES b/CHANGES index 21e793cb2b..ad218fd341 100644 --- 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 3e61af0c59..3cf5c83cc0 100644 --- 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 4809fdd00c..dea29f67d3 100644 --- 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;