More system schema checks

[openldap] / servers / slapd / operation.c

diff --git a/servers/slapd/operation.c b/servers/slapd/operation.c
index 7848357a935b8c7639437ff75346c3117a07f99e..859a88acee99a33ee6dbe50449693835c71e7336 100644 (file)
--- a/servers/slapd/operation.c
+++ b/servers/slapd/operation.c
@@ -1,4 +1,9 @@
 /* operation.c - routines to deal with pending ldap operations */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
@@ -13,32 +18,35 @@
 void
 slap_op_free( Operation *op )
 {
-       assert( op->o_next == NULL );
-
-       ldap_pvt_thread_mutex_lock( &op->o_abandonmutex );
+       assert( LDAP_STAILQ_NEXT(op, o_next) == NULL );
 
        if ( op->o_ber != NULL ) {
                ber_free( op->o_ber, 1 );
        }
-       if ( op->o_dn != NULL ) {
-               free( op->o_dn );
+       if ( op->o_dn.bv_val != NULL ) {
+               free( op->o_dn.bv_val );
+       }
+       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_ndn != NULL ) {
-               free( op->o_ndn );
+       if ( op->o_ctrls != NULL ) {
+               ldap_controls_free( op->o_ctrls );
        }
 
-       ldap_pvt_thread_mutex_unlock( &op->o_abandonmutex );
        ldap_pvt_thread_mutex_destroy( &op->o_abandonmutex );
+
        free( (char *) op );
 }
 
 Operation *
 slap_op_alloc(
     BerElement         *ber,
-    unsigned long      msgid,
-    unsigned long      tag,
-    int                                id,
-    int                                connid
+    ber_int_t  msgid,
+    ber_tag_t  tag,
+    ber_int_t  id
 )
 {
        Operation       *op;
@@ -46,24 +54,18 @@ slap_op_alloc(
        op = (Operation *) ch_calloc( 1, sizeof(Operation) );
 
        ldap_pvt_thread_mutex_init( &op->o_abandonmutex );
+
        op->o_ber = ber;
        op->o_msgid = msgid;
        op->o_tag = tag;
-       op->o_abandon = 0;
 
-       op->o_dn = NULL;
-       op->o_ndn = NULL;
-
-       ldap_pvt_thread_mutex_lock( &currenttime_mutex );
-       op->o_time = currenttime;
-       ldap_pvt_thread_mutex_unlock( &currenttime_mutex );
+       op->o_time = slap_get_time();
        op->o_opid = id;
-       op->o_connid = connid;
-       op->o_next = NULL;
 
        return( op );
 }
 
+#if 0
 int slap_op_add(
     Operation          **olist,
        Operation               *op
@@ -88,8 +90,15 @@ slap_op_remove( Operation **olist, Operation *op )
                ;       /* 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",
-                   op->o_msgid, 0, 0 );
+                      (long) op->o_msgid, 0, 0 );
+#endif
+
                return -1; 
        }
 
@@ -110,4 +119,4 @@ Operation * slap_op_pop( Operation **olist )
 
        return tmp;
 }
-
+#endif