From 6b97fd20b8e7b704cc888df984c40e4fc5264054 Mon Sep 17 00:00:00 2001 From: Kurt Zeilenga Date: Mon, 9 Sep 2002 18:26:30 +0000 Subject: [PATCH] Plug leaks --- servers/slapd/tools/slapadd.c | 10 +++++----- servers/slapd/tools/slapcommon.c | 5 +++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/servers/slapd/tools/slapadd.c b/servers/slapd/tools/slapadd.c index 7e6470ca6f..81f81f3f41 100644 --- a/servers/slapd/tools/slapadd.c +++ b/servers/slapd/tools/slapadd.c @@ -188,7 +188,7 @@ main( int argc, char **argv ) if( attr_find( e->e_attrs, slap_schema.si_ad_creatorsName ) == NULL ) { - ber_dupbv( &vals[0], &name ); + vals[0] = name; vals[1].bv_len = 0; vals[1].bv_val = NULL; attr_merge( e, slap_schema.si_ad_creatorsName, vals); @@ -197,7 +197,7 @@ main( int argc, char **argv ) if( attr_find( e->e_attrs, slap_schema.si_ad_modifiersName ) == NULL ) { - ber_dupbv( &vals[0], &name ); + vals[0] = name; vals[1].bv_len = 0; vals[1].bv_val = NULL; attr_merge( e, slap_schema.si_ad_modifiersName, vals); @@ -206,7 +206,7 @@ main( int argc, char **argv ) if( attr_find( e->e_attrs, slap_schema.si_ad_createTimestamp ) == NULL ) { - ber_dupbv( &vals[0], ×tamp ); + vals[0] = timestamp; vals[1].bv_len = 0; vals[1].bv_val = NULL; attr_merge( e, slap_schema.si_ad_createTimestamp, vals ); @@ -215,7 +215,7 @@ main( int argc, char **argv ) if( attr_find( e->e_attrs, slap_schema.si_ad_modifyTimestamp ) == NULL ) { - ber_dupbv( &vals[0], ×tamp ); + vals[0] = timestamp; vals[1].bv_len = 0; vals[1].bv_val = NULL; attr_merge( e, slap_schema.si_ad_modifyTimestamp, vals ); @@ -224,7 +224,7 @@ main( int argc, char **argv ) if( attr_find( e->e_attrs, slap_schema.si_ad_entryCSN ) == NULL ) { - ber_dupbv( &vals[0], &csn ); + vals[0] = csn; vals[1].bv_len = 0; vals[1].bv_val = NULL; attr_merge( e, slap_schema.si_ad_entryCSN, vals ); diff --git a/servers/slapd/tools/slapcommon.c b/servers/slapd/tools/slapcommon.c index 27c6712724..bf3b50383d 100644 --- a/servers/slapd/tools/slapcommon.c +++ b/servers/slapd/tools/slapcommon.c @@ -278,6 +278,11 @@ void slap_tool_destroy( void ) { slap_shutdown( be ); slap_destroy(); + schema_destroy(); +#ifdef HAVE_TLS + ldap_pvt_tls_destroy(); +#endif + config_destroy(); #ifdef CSRIMALLOC mal_dumpleaktrace( leakfile ); -- 2.39.5