cleanup bind

[openldap] / servers / slapd / operation.c

diff --git a/servers/slapd/operation.c b/servers/slapd/operation.c
index 0dd9c1f334fdd7c2105ad7fe81016ab6416a9c79..2a8da886da336e1b588d7941c8da1bfba0274b6d 100644 (file)
--- a/servers/slapd/operation.c
+++ b/servers/slapd/operation.c
@@ -1,7 +1,7 @@
 /* operation.c - routines to deal with pending ldap operations */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -14,11 +14,15 @@
 
 #include "slap.h"
 
+#ifdef LDAP_SLAPI
+#include "slapi.h"
+#endif
+
 
 void
 slap_op_free( Operation *op )
 {
-       assert( op->o_next == NULL );
+       assert( LDAP_STAILQ_NEXT(op, o_next) == NULL );
 
        if ( op->o_ber != NULL ) {
                ber_free( op->o_ber, 1 );
@@ -29,14 +33,34 @@ slap_op_free( Operation *op )
        if ( op->o_ndn.bv_val != NULL ) {
                free( op->o_ndn.bv_val );
        }
-       if ( op->o_authmech != NULL ) {
-               free( op->o_authmech );
+       if ( op->o_authmech.bv_val != NULL ) {
+               free( op->o_authmech.bv_val );
        }
        if ( op->o_ctrls != NULL ) {
                ldap_controls_free( op->o_ctrls );
        }
 
-       ldap_pvt_thread_mutex_destroy( &op->o_abandonmutex );
+#ifdef LDAP_CONNECTIONLESS
+       if ( op->o_res_ber != NULL ) {
+               ber_free( op->o_res_ber, 1 );
+       }
+#endif
+#ifdef LDAP_CLIENT_UPDATE
+       if ( op->o_clientupdate_state.bv_val != NULL ) {
+               free( op->o_clientupdate_state.bv_val );
+       }
+#endif
+#ifdef LDAP_SYNC
+       if ( op->o_sync_state.bv_val != NULL ) {
+               free( op->o_sync_state.bv_val );
+       }
+#endif
+
+#if defined( LDAP_SLAPI )
+       if ( op->o_pb != NULL ) {
+               slapi_pblock_destroy( (Slapi_PBlock *)op->o_pb );
+       }
+#endif /* defined( LDAP_SLAPI ) */
 
        free( (char *) op );
 }
@@ -53,78 +77,19 @@ slap_op_alloc(
 
        op = (Operation *) ch_calloc( 1, sizeof(Operation) );
 
-       ldap_pvt_thread_mutex_init( &op->o_abandonmutex );
-       op->o_abandon = 0;
-
        op->o_ber = ber;
        op->o_msgid = msgid;
        op->o_tag = tag;
 
-       op->o_dn.bv_val = NULL;
-       op->o_dn.bv_len = 0;
-       op->o_ndn.bv_val = NULL;
-       op->o_ndn.bv_len = 0;
-       op->o_authmech = NULL;
-       op->o_ctrls = NULL;
-
        op->o_time = slap_get_time();
        op->o_opid = id;
-       op->o_next = NULL;
-
-       return( op );
-}
-
-int slap_op_add(
-    Operation          **olist,
-       Operation               *op
-)
-{
-       Operation       **tmp;
-
-       for ( tmp = olist; *tmp != NULL; tmp = &(*tmp)->o_next )
-               ;       /* NULL */
-
-       *tmp = op;
-
-       return 0;
-}
-
-int
-slap_op_remove( Operation **olist, Operation *op )
-{
-       Operation       **tmp;
-
-       for ( tmp = olist; *tmp != NULL && *tmp != op; tmp = &(*tmp)->o_next )
-               ;       /* NULL */
-
-       if ( *tmp == NULL ) {
-#ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                          "slap_op_remove: can't find op %ld.\n",
-                          (long)op->o_msgid ));
-#else
-               Debug( LDAP_DEBUG_ANY, "op_delete: can't find op %ld\n",
-                      (long) op->o_msgid, 0, 0 );
+#ifdef LDAP_CONNECTIONLESS
+       op->o_res_ber = NULL;
 #endif
 
-               return -1; 
-       }
-
-       *tmp = (*tmp)->o_next;
-       op->o_next = NULL;
+#if defined( LDAP_SLAPI )
+       op->o_pb = slapi_pblock_new();
+#endif /* defined( LDAP_SLAPI ) */
 
-       return 0;
-}
-
-Operation * slap_op_pop( Operation **olist )
-{
-       Operation *tmp = *olist;
-
-       if(tmp != NULL) {
-               *olist = tmp->o_next;
-               tmp->o_next = NULL;
-       }
-
-       return tmp;
+       return( op );
 }
-