/* operation.c - routines to deal with pending ldap operations */
+/* $OpenLDAP$ */
/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
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 );
+ if ( op->o_authmech.bv_val != NULL ) {
+ free( op->o_authmech.bv_val );
}
if ( op->o_ctrls != NULL ) {
ldap_controls_free( op->o_ctrls );
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
; /* 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 );
+#endif
+
return -1;
}
return tmp;
}
-
+#endif