Fix ITS#1991 - referrals with sarch base == target (wasn't sure at first,

[openldap] / servers / slapd / abandon.c

diff --git a/servers/slapd/abandon.c b/servers/slapd/abandon.c
index 7da48204e7b88cc1ce91cc278dfe149d708c0fba..80ea94be0ce51671969174d2d19c419d889fc7dd 100644 (file)
--- a/servers/slapd/abandon.c
+++ b/servers/slapd/abandon.c
@@ -1,7 +1,7 @@
 /* abandon.c - decode and handle an ldap abandon operation */
 /* $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
  */
 
@@ -32,11 +32,10 @@ do_abandon(
 {
        ber_int_t               id;
        Operation       *o;
-       int rc, notfound;
+       int rc;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY, "conn: %d do_abandon\n",
-               conn->c_connid));
+       LDAP_LOG( OPERATION, ENTRY, "conn: %d do_abandon\n", conn->c_connid, 0, 0);
 #else
        Debug( LDAP_DEBUG_TRACE, "do_abandon\n", 0, 0, 0 );
 #endif
@@ -49,9 +48,8 @@ do_abandon(
 
        if ( ber_scanf( op->o_ber, "i", &id ) == LBER_ERROR ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_ERR, 
-                      "conn: %d do_abandon: ber_scanf failed\n",
-                      conn->c_connid ));
+               LDAP_LOG( OPERATION, ERR, 
+                       "conn: %d do_abandon: ber_scanf failed\n", conn->c_connid, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY, "do_abandon: ber_scanf failed\n", 0, 0 ,0 );
 #endif
@@ -66,16 +64,17 @@ do_abandon(
        } 
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
-               "do_abandon: conn: %d  id=%ld\n", conn->c_connid, (long) id ));
+       LDAP_LOG( OPERATION, ARGS, "do_abandon: conn: %d  id=%ld\n", 
+               conn->c_connid, (long) id, 0 );
 #else
        Debug( LDAP_DEBUG_ARGS, "do_abandon: id=%ld\n", (long) id, 0 ,0 );
 #endif
 
        if( id <= 0 ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                   "do_abandon: conn: %d bad msgid %ld\n", conn->c_connid, (long) id ));
+               LDAP_LOG( OPERATION, ERR, 
+                       "do_abandon: conn: %d bad msgid %ld\n", 
+                       conn->c_connid, (long) id, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                        "do_abandon: bad msgid %ld\n", (long) id, 0, 0 );
@@ -92,9 +91,7 @@ do_abandon(
 
        LDAP_STAILQ_FOREACH( o, &conn->c_ops, o_next ) {
                if ( o->o_msgid == id ) {
-                       ldap_pvt_thread_mutex_lock( &o->o_abandonmutex );
                        o->o_abandon = 1;
-                       ldap_pvt_thread_mutex_unlock( &o->o_abandonmutex );
                        goto done;
                }
        }
@@ -111,9 +108,9 @@ done:
        ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
+       LDAP_LOG( OPERATION, ENTRY, 
                "do_abandon: conn: %d op=%ld %sfound\n",
-               conn->c_connid, (long)id, o ? "" : "not " ));
+               conn->c_connid, (long)id, o ? "" : "not " );
 #else
        Debug( LDAP_DEBUG_TRACE, "do_abandon: op=%ld %sfound\n",
                (long) id, o ? "" : "not ", 0 );