better fix to ITS#3433

diff --git a/servers/slapd/backover.c b/servers/slapd/backover.c
index 43299c1e0689019dbc1150401ee681e142892c66..1efbfcb565fa606064ef17a13f5df63547c09814 100644 (file)
--- 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 03b5624f2f583d2377a45d89c9ae3fd2a45a3f14..3cad16d76080c3a7bcb1b1f2c71fabb3b3e1b035 100644 (file)
--- 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 );
        }