mostly revert previous commit

diff --git a/libraries/liblber/options.c b/libraries/liblber/options.c
index 56769ed628820c95ee4d8df179eaed42a2e8130d..02fb7c594edc0f305416f29dcd00750b19a76b8c 100644 (file)
--- a/libraries/liblber/options.c
+++ b/libraries/liblber/options.c
@@ -62,6 +62,7 @@ ber_get_option(
 #else
                        return LBER_OPT_ERROR;
 #endif
+
                case LBER_OPT_LOG_PRINT_FILE:
                        *((FILE**)outvalue) = (FILE*)ber_pvt_err_file;
                        return LBER_OPT_SUCCESS;
@@ -167,7 +168,6 @@ ber_set_option(
                        
                ber_int_memory_fns->bmf_free( ber_int_memory_fns, NULL );
                ber_int_memory_fns = NULL;
-               ber_int_options.lbo_valid = LBER_UNINITIALIZED;
                return LBER_OPT_SUCCESS;
        }
 

diff --git a/servers/slapd/sl_malloc.c b/servers/slapd/sl_malloc.c
index 5b591e9eda2db575301340798765498a9fa2a804..e5d78627dd864e9408ac8bb3aa12c5f091a3ad35 100644 (file)
--- a/servers/slapd/sl_malloc.c
+++ b/servers/slapd/sl_malloc.c
@@ -73,8 +73,6 @@ slap_sl_mem_destroy(
                ber_memfree_x(sh->sh_base, NULL);
                ber_memfree_x(sh, NULL);
        }
-
-       ber_set_option( NULL, LBER_OPT_MEMORY_FNS, NULL );
 }
 
 BerMemoryFunctions slap_sl_mfuncs =