fix previous commit

[openldap] / servers / slapd / operation.c

diff --git a/servers/slapd/operation.c b/servers/slapd/operation.c
index 2ffbdbef39c2fa0d6cacdd886aedff06da0398f8..4946c772fd2986676a0aa633b99c883ff2995100 100644 (file)
--- a/servers/slapd/operation.c
+++ b/servers/slapd/operation.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2003 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,7 +34,7 @@
 #include "slap.h"
 
 #ifdef LDAP_SLAPI
-#include "slapi.h"
+#include "slapi/slapi.h"
 #endif
 
 static ldap_pvt_thread_mutex_t slap_op_mutex;
@@ -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 ) {
@@ -87,13 +87,11 @@ slap_op_free( Operation *op )
        }
 #endif
 
-       slap_sync_cookie_free( &op->o_sync_state, 0 );
-
        {
                GroupAssertion *g, *n;
-               for (g = op->o_groups; g; g=n) {
+               for ( g = op->o_groups; g; g = n ) {
                        n = g->ga_next;
-                       sl_free(g, op->o_tmpmemctx);
+                       slap_sl_free( g, op->o_tmpmemctx );
                }
                op->o_groups = NULL;
        }
@@ -105,15 +103,11 @@ slap_op_free( Operation *op )
        }
 #endif /* defined( LDAP_SLAPI ) */
 
-       if ( op->o_sync_csn.bv_val != NULL ) {
-               ch_free( op->o_sync_csn.bv_val );
-       }
 
-       memset( op, 0, sizeof(Operation) );
+       memset( op, 0, sizeof(Operation) + sizeof(Opheader) + SLAP_MAX_CIDS * sizeof(void *) );
+       op->o_hdr = (Opheader *)(op+1);
+       op->o_controls = (void **)(op->o_hdr+1);
 
-       op->o_sync_state.sid = -1;
-       op->o_sync_slog_size = -1;
-       op->o_sync_state.rid = -1;
        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 );
@@ -137,7 +131,10 @@ slap_op_alloc(
        ldap_pvt_thread_mutex_unlock( &slap_op_mutex );
 
        if (!op) {
-               op = (Operation *) ch_calloc( 1, sizeof(Operation) );
+               op = (Operation *) ch_calloc( 1, sizeof(Operation)
+                       + sizeof(Opheader) + SLAP_MAX_CIDS * sizeof(void *) );
+               op->o_hdr = (Opheader *)(op + 1);
+               op->o_controls = (void **)(op->o_hdr+1);
        }
 
        op->o_ber = ber;
@@ -148,12 +145,6 @@ slap_op_alloc(
        op->o_opid = id;
        op->o_res_ber = NULL;
 
-       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 );
-
 #if defined( LDAP_SLAPI )
        if ( slapi_plugins_used ) {
                op->o_pb = slapi_pblock_new();