From: Pierangelo Masarati <ando@openldap.org>
Date: Sat, 11 Dec 2004 15:41:50 +0000 (+0000)
Subject: better fix to ITS#3433
X-Git-Tag: OPENLDAP_REL_ENG_2_3_0ALPHA~61
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=b498a9222ac1cc6bde0bdb61408d6266008a63d4;p=openldap

better fix to ITS#3433
---

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 );
 	}