Switch to openldap-data

[openldap] / servers / slapd / operation.c

diff --git a/servers/slapd/operation.c b/servers/slapd/operation.c
index 9440784b4de5a274879630a4965befc7102ef9ac..aee5ef9b5560b95f961d4419101d3c9d92024469 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,7 +18,7 @@
 void
 slap_op_free( Operation *op )
 {
-       assert( STAILQ_NEXT(op, o_next) == NULL );
+       assert( LDAP_STAILQ_NEXT(op, o_next) == NULL );
 
        if ( op->o_ber != NULL ) {
                ber_free( op->o_ber, 1 );
@@ -29,8 +29,8 @@ 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 );