From b498a9222ac1cc6bde0bdb61408d6266008a63d4 Mon Sep 17 00:00:00 2001 From: Pierangelo Masarati Date: Sat, 11 Dec 2004 15:41:50 +0000 Subject: [PATCH] better fix to ITS#3433 --- servers/slapd/backover.c | 7 +++---- servers/slapd/connection.c | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/servers/slapd/backover.c b/servers/slapd/backover.c index 43299c1e06..1efbfcb565 100644 --- a/servers/slapd/backover.c +++ b/servers/slapd/backover.c @@ -260,10 +260,9 @@ over_op_func( slap_callback cb = {NULL, over_back_response, NULL, NULL}; int rc = SLAP_CB_CONTINUE; - if ( op->o_bd == NULL ) { - /* FIXME: happens for instance during abandon... */ - return 0; - } + /* FIXME: used to happen for instance during abandon + * when global overlays are used... */ + assert( op->o_bd != NULL ); oi = op->o_bd->bd_info->bi_private; on = oi->oi_list; diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c index 03b5624f2f..3cad16d760 100644 --- a/servers/slapd/connection.c +++ b/servers/slapd/connection.c @@ -722,6 +722,7 @@ static void connection_abandon( Connection *c ) next = LDAP_STAILQ_NEXT( o, o_next ); op.orn_msgid = o->o_msgid; o->o_abandon = 1; + op.o_bd = frontendDB; frontendDB->be_abandon( &op, &rs ); } -- 2.39.5