X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Foperation.c;h=dc056040b4e47f1c4277b7da0ba74cdae4aebe52;hb=49b0985c88ea6836a24c314aea2cb2dd0d129544;hp=b2a51370b791018049022f4dea772b6676c99cd2;hpb=262f8bf11fb4c5188d040b8f8ba79d0a48cba3f0;p=openldap
diff --git a/servers/slapd/operation.c b/servers/slapd/operation.c
index b2a51370b7..dc056040b4 100644
--- 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 .
+ *
+ * Copyright 1998-2003 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
+ * .
+ */
+/* 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"
@@ -42,6 +61,8 @@ 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 ) {
@@ -65,19 +86,34 @@ slap_op_free( Operation *op )
ber_free( op->o_res_ber, 1 );
}
#endif
-#ifdef LDAP_SYNC
- if ( op->o_sync_state.bv_val != NULL ) {
- free( op->o_sync_state.bv_val );
+
+ slap_sync_cookie_free( &op->o_sync_state, 0 );
+
+ {
+ GroupAssertion *g, *n;
+ for (g = op->o_groups; g; g=n) {
+ n = g->ga_next;
+ sl_free(g, op->o_tmpmemctx);
+ }
+ op->o_groups = NULL;
}
-#endif
#if defined( LDAP_SLAPI )
if ( op->o_pb != NULL ) {
slapi_pblock_destroy( (Slapi_PBlock *)op->o_pb );
+ slapi_x_free_object_extensions( SLAPI_X_EXT_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) );
+
+ 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 );
@@ -92,6 +128,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 ))) {
@@ -99,8 +136,9 @@ slap_op_alloc(
}
ldap_pvt_thread_mutex_unlock( &slap_op_mutex );
- if (!op)
+ if (!op) {
op = (Operation *) ch_calloc( 1, sizeof(Operation) );
+ }
op->o_ber = ber;
op->o_msgid = msgid;
@@ -108,12 +146,19 @@ slap_op_alloc(
op->o_time = slap_get_time();
op->o_opid = id;
-#ifdef LDAP_CONNECTIONLESS
op->o_res_ber = NULL;
-#endif
+
+ 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 )
- op->o_pb = slapi_pblock_new();
+ if ( slapi_plugins_used ) {
+ op->o_pb = slapi_pblock_new();
+ slapi_x_create_object_extensions( SLAPI_X_EXT_OPERATION, op );
+ }
#endif /* defined( LDAP_SLAPI ) */
return( op );