X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fabandon.c;h=c77dc1e25e34756e0783c7c0305fe8170146a648;hb=24db207196a453a4f9acdce08593c7e0ed53ce4c;hp=f4a2cb3602154d9af1214931f7f7d42f8ff2d941;hpb=639d678592afb79eff17313282c3504c9b02638d;p=openldap

diff --git a/servers/slapd/abandon.c b/servers/slapd/abandon.c
index f4a2cb3602..c77dc1e25e 100644
--- a/servers/slapd/abandon.c
+++ b/servers/slapd/abandon.c
@@ -37,7 +37,8 @@ do_abandon( Operation *op, SlapReply *rs )
 	ber_int_t	id;
 	Operation	*o;
 
-	Debug( LDAP_DEBUG_TRACE, "do_abandon\n", 0, 0, 0 );
+	Debug( LDAP_DEBUG_TRACE, "%s do_abandon\n",
+		op->o_log_prefix, 0, 0 );
 
 	/*
 	 * Parse the abandon request.  It looks like this:
@@ -46,7 +47,8 @@ do_abandon( Operation *op, SlapReply *rs )
 	 */
 
 	if ( ber_scanf( op->o_ber, "i", &id ) == LBER_ERROR ) {
-		Debug( LDAP_DEBUG_ANY, "do_abandon: ber_scanf failed\n", 0, 0 ,0 );
+		Debug( LDAP_DEBUG_ANY, "%s do_abandon: ber_scanf failed\n",
+			op->o_log_prefix, 0, 0 );
 		send_ldap_discon( op, rs, LDAP_PROTOCOL_ERROR, "decoding error" );
 		return SLAPD_DISCONNECT;
 	}
@@ -55,15 +57,17 @@ do_abandon( Operation *op, SlapReply *rs )
 		op->o_log_prefix, (long) id, 0, 0, 0 );
 
 	if( get_ctrls( op, rs, 0 ) != LDAP_SUCCESS ) {
-		Debug( LDAP_DEBUG_ANY, "do_abandon: get_ctrls failed\n", 0, 0 ,0 );
+		Debug( LDAP_DEBUG_ANY, "%s do_abandon: get_ctrls failed\n",
+			op->o_log_prefix, 0, 0 );
 		return rs->sr_err;
 	} 
 
-	Debug( LDAP_DEBUG_ARGS, "do_abandon: id=%ld\n", (long) id, 0 ,0 );
+	Debug( LDAP_DEBUG_ARGS, "%s do_abandon: id=%ld\n",
+		op->o_log_prefix, (long) id, 0 );
 
 	if( id <= 0 ) {
-		Debug( LDAP_DEBUG_ANY,
-			"do_abandon: bad msgid %ld\n", (long) id, 0, 0 );
+		Debug( LDAP_DEBUG_ANY, "%s do_abandon: bad msgid %ld\n",
+			op->o_log_prefix, (long) id, 0 );
 		return LDAP_SUCCESS;
 	}
 
@@ -102,8 +106,9 @@ do_abandon( Operation *op, SlapReply *rs )
 
 	ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
 
-	Debug( LDAP_DEBUG_TRACE, "do_abandon: op=%ld %sfound\n",
-		(long) id, o ? "" : "not ", 0 );
+	Debug( LDAP_DEBUG_TRACE, "%s do_abandon: op=%ld %sfound\n",
+		op->o_log_prefix,
+		(long) id, o ? "" : "not " );
 	return rs->sr_err;
 }