X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Foperation.c;h=e65fd4d7ad9c5e3dd3411d26128e7ce6cdf23077;hb=5c3a4e176e9539f58a1ac666ad370b4c204cd44c;hp=68d8a758213840ff2a7cbd9a79a354755b851587;hpb=3a5bde98ba61a853f4305d6c844f4aad439c8a4a;p=openldap

diff --git a/servers/slapd/operation.c b/servers/slapd/operation.c
index 68d8a75821..e65fd4d7ad 100644
--- 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-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -53,7 +53,6 @@ void slap_op_destroy(void)
 	while ( (o = LDAP_STAILQ_FIRST( &slap_free_ops )) != NULL) {
 		LDAP_STAILQ_REMOVE_HEAD( &slap_free_ops, o_next );
 		LDAP_STAILQ_NEXT(o, o_next) = NULL;
-		ch_free( o->o_controls );
 		ch_free( o );
 	}
 	ldap_pvt_thread_mutex_destroy( &slap_op_mutex );
@@ -63,7 +62,6 @@ void
 slap_op_free( Operation *op )
 {
 	struct berval slap_empty_bv_dup;
-	void **controls;
 
 	assert( LDAP_STAILQ_NEXT(op, o_next) == NULL );
 
@@ -106,20 +104,9 @@ slap_op_free( Operation *op )
 #endif /* defined( LDAP_SLAPI ) */
 
 
-	controls = op->o_controls;
-	memset( controls, 0, sizeof(void *) * SLAP_MAX_CIDS );
-	memset( op, 0, sizeof(Operation) );
-	op->o_controls = controls;
-
-#if 0
-	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
+	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 );
@@ -144,8 +131,10 @@ slap_op_alloc(
 	ldap_pvt_thread_mutex_unlock( &slap_op_mutex );
 
 	if (!op) {
-		op = (Operation *) ch_calloc( 1, sizeof(Operation) );
-		op->o_controls = (void **) ch_calloc( SLAP_MAX_CIDS, sizeof( void *));
+		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;
@@ -156,14 +145,6 @@ slap_op_alloc(
 	op->o_opid = id;
 	op->o_res_ber = NULL;
 
-#if 0
-	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();