fix previous commit

[openldap] / servers / slapd / operation.c

diff --git a/servers/slapd/operation.c b/servers/slapd/operation.c
index cb08e60eee324f456cb388ff611ab3af50868eba..4946c772fd2986676a0aa633b99c883ff2995100 100644 (file)
--- a/servers/slapd/operation.c
+++ b/servers/slapd/operation.c
@@ -1,8 +1,27 @@
 /* operation.c - routines to deal with pending ldap operations */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2005 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
  */
 
 #include "portable.h"
@@ -15,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;
@@ -42,18 +61,20 @@ void slap_op_destroy(void)
 void
 slap_op_free( Operation *op )
 {
+       struct berval slap_empty_bv_dup;
+
        assert( LDAP_STAILQ_NEXT(op, o_next) == NULL );
 
        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 ) {
@@ -65,15 +86,12 @@ slap_op_free( Operation *op )
                ber_free( op->o_res_ber, 1 );
        }
 #endif
-       if ( op->o_sync_state.bv_val != NULL ) {
-               free( op->o_sync_state.bv_val );
-       }
 
        {
                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;
        }
@@ -81,11 +99,15 @@ slap_op_free( Operation *op )
 #if defined( LDAP_SLAPI )
        if ( op->o_pb != NULL ) {
                slapi_pblock_destroy( (Slapi_PBlock *)op->o_pb );
+               slapi_int_free_object_extensions( SLAPI_X_EXT_OPERATION, op );
        }
-       slapi_x_free_object_extensions( SLAPI_X_EXT_OPERATION, op );
 #endif /* defined( LDAP_SLAPI ) */
 
-       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);
+
        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 );
@@ -100,6 +122,7 @@ slap_op_alloc(
 )
 {
        Operation       *op;
+       struct berval slap_empty_bv_dup;
 
        ldap_pvt_thread_mutex_lock( &slap_op_mutex );
        if ((op = LDAP_STAILQ_FIRST( &slap_free_ops ))) {
@@ -107,8 +130,12 @@ slap_op_alloc(
        }
        ldap_pvt_thread_mutex_unlock( &slap_op_mutex );
 
-       if (!op)
-               op = (Operation *) ch_calloc( 1, sizeof(Operation) );
+       if (!op) {
+               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;
        op->o_msgid = msgid;
@@ -119,8 +146,10 @@ slap_op_alloc(
        op->o_res_ber = NULL;
 
 #if defined( LDAP_SLAPI )
-       op->o_pb = slapi_pblock_new();
-       slapi_x_create_object_extensions( SLAPI_X_EXT_OPERATION, op );
+       if ( slapi_plugins_used ) {
+               op->o_pb = slapi_pblock_new();
+               slapi_int_create_object_extensions( SLAPI_X_EXT_OPERATION, op );
+       }
 #endif /* defined( LDAP_SLAPI ) */
 
        return( op );