X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Foperation.c;h=f8ecf3b920548920b5d3bbb7f85372ea9e09882d;hb=5631f25839a4a83521993639a96909267ea7bce6;hp=d2e9fd05f7c63bc0b347a4c310241273160b2103;hpb=5d2ba11ad924cfe9be57d7d6a1e6a37e108bbe10;p=openldap

diff --git a/servers/slapd/operation.c b/servers/slapd/operation.c
index d2e9fd05f7..f8ecf3b920 100644
--- a/servers/slapd/operation.c
+++ b/servers/slapd/operation.c
@@ -69,13 +69,13 @@ slap_op_free( Operation *op )
 		ber_free( op->o_ber, 1 );
 	}
 	if ( !BER_BVISNULL( &op->o_dn ) ) {
-		free( op->o_dn.bv_val );
+		ch_free( op->o_dn.bv_val );
 	}
 	if ( !BER_BVISNULL( &op->o_ndn ) ) {
-		free( op->o_ndn.bv_val );
+		ch_free( op->o_ndn.bv_val );
 	}
 	if ( !BER_BVISNULL( &op->o_authmech ) ) {
-		free( op->o_authmech.bv_val );
+		ch_free( op->o_authmech.bv_val );
 	}
 	if ( op->o_ctrls != NULL ) {
 		slap_free_ctrls( op, op->o_ctrls );
@@ -97,8 +97,7 @@ slap_op_free( Operation *op )
 	}
 
 #if defined( LDAP_SLAPI )
-	if ( op->o_pb != NULL ) {
-		slapi_pblock_destroy( (Slapi_PBlock *)op->o_pb );
+	if ( slapi_plugins_used ) {
 		slapi_int_free_object_extensions( SLAPI_X_EXT_OPERATION, op );
 	}
 #endif /* defined( LDAP_SLAPI ) */
@@ -152,7 +151,6 @@ slap_op_alloc(
 
 #if defined( LDAP_SLAPI )
 	if ( slapi_plugins_used ) {
-		op->o_pb = slapi_pblock_new();
 		slapi_int_create_object_extensions( SLAPI_X_EXT_OPERATION, op );
 	}
 #endif /* defined( LDAP_SLAPI ) */