More system schema checks

[openldap] / servers / slapd / operation.c

diff --git a/servers/slapd/operation.c b/servers/slapd/operation.c
index 159b57278c7fd4c6498a2b46eecede80f63f5197..859a88acee99a33ee6dbe50449693835c71e7336 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-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -18,16 +18,16 @@
 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 );
        }
-       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 != NULL ) {
-               free( op->o_ndn );
+       if ( op->o_ndn.bv_val != NULL ) {
+               free( op->o_ndn.bv_val );
        }
        if ( op->o_authmech != NULL ) {
                free( op->o_authmech );
@@ -54,24 +54,18 @@ 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 = NULL;
-       op->o_ndn = NULL;
-       op->o_authmech = NULL;
-       op->o_ctrls = NULL;
-
        op->o_time = slap_get_time();
        op->o_opid = id;
-       op->o_next = NULL;
 
        return( op );
 }
 
+#if 0
 int slap_op_add(
     Operation          **olist,
        Operation               *op
@@ -125,4 +119,4 @@ Operation * slap_op_pop( Operation **olist )
 
        return tmp;
 }
-
+#endif