fix previous commit

[openldap] / servers / slapd / operation.c

diff --git a/servers/slapd/operation.c b/servers/slapd/operation.c
index 03b0e7df3fdf8ecb14b63b1deeaa34a91ced89d6..4946c772fd2986676a0aa633b99c883ff2995100 100644 (file)
--- a/servers/slapd/operation.c
+++ b/servers/slapd/operation.c
@@ -68,13 +68,13 @@ slap_op_free( Operation *op )
        if ( op->o_ber != NULL ) {
                ber_free( op->o_ber, 1 );
        }
-       if ( op->o_dn.bv_val != NULL ) {
+       if ( !BER_BVISNULL( &op->o_dn ) ) {
                free( op->o_dn.bv_val );
        }
-       if ( op->o_ndn.bv_val != NULL ) {
+       if ( !BER_BVISNULL( &op->o_ndn ) ) {
                free( op->o_ndn.bv_val );
        }
-       if ( op->o_authmech.bv_val != NULL ) {
+       if ( !BER_BVISNULL( &op->o_authmech ) ) {
                free( op->o_authmech.bv_val );
        }
        if ( op->o_ctrls != NULL ) {
@@ -89,9 +89,9 @@ slap_op_free( Operation *op )
 
        {
                GroupAssertion *g, *n;
-               for (g = op->o_groups; g; g=n) {
+               for ( g = op->o_groups; g; g = n ) {
                        n = g->ga_next;
-                       slap_sl_free(g, op->o_tmpmemctx);
+                       slap_sl_free( g, op->o_tmpmemctx );
                }
                op->o_groups = NULL;
        }
@@ -108,16 +108,6 @@ slap_op_free( Operation *op )
        op->o_hdr = (Opheader *)(op+1);
        op->o_controls = (void **)(op->o_hdr+1);
 
-#if 0  /* DELETE ME */
-       slap_sync_cookie_free( &op->o_sync_state, 0 );
-       if ( op->o_sync_csn.bv_val != NULL ) {
-               ch_free( op->o_sync_csn.bv_val );
-       }
-       op->o_sync_state.sid = -1;
-       op->o_sync_slog_size = -1;
-       op->o_sync_state.rid = -1;
-#endif
-
        ldap_pvt_thread_mutex_lock( &slap_op_mutex );
        LDAP_STAILQ_INSERT_HEAD( &slap_free_ops, op, o_next );
        ldap_pvt_thread_mutex_unlock( &slap_op_mutex );
@@ -155,14 +145,6 @@ slap_op_alloc(
        op->o_opid = id;
        op->o_res_ber = NULL;
 
-#if 0  /* DELETE ME */
-       op->o_sync_state.sid = -1;
-       op->o_sync_slog_size = -1;
-       op->o_sync_state.rid = -1;
-       LDAP_STAILQ_FIRST( &op->o_sync_slog_list ) = NULL;
-       op->o_sync_slog_list.stqh_last = &LDAP_STAILQ_FIRST( &op->o_sync_slog_list );
-#endif
-
 #if defined( LDAP_SLAPI )
        if ( slapi_plugins_used ) {
                op->o_pb = slapi_pblock_new();