be = op->o_bd;
for ( i=0; i<j; i++ ) {
sort_node *sn = cur_node->avl_data;
-
+
+ if ( slapd_shutdown ) break;
+
op->o_bd = select_backend( &sn->sn_dn, 0 );
e = NULL;
rc = be_entry_get_rw( op, &sn->sn_dn, NULL, NULL, 0, &e );
while ( cur_node && rs->sr_nentries < so->so_page_size ) {
sort_node *sn = cur_node->avl_data;
+ if ( slapd_shutdown ) break;
+
next_node = tavl_next( cur_node, TAVL_DIR_RIGHT );
op->o_bd = select_backend( &sn->sn_dn, 0 );
op->o_tmpmemctx );
/* Install serversort response callback to handle a new search */
if ( ps || vc ) {
- so = ch_malloc( sizeof(sort_op));
+ so = ch_calloc( 1, sizeof(sort_op));
} else {
- so = op->o_tmpalloc( sizeof(sort_op), op->o_tmpmemctx );
+ so = op->o_tmpcalloc( 1, sizeof(sort_op), op->o_tmpmemctx );
}
sort_conns[op->o_conn->c_conn_idx] = so;
if ( rc == LDAP_SUCCESS ) {
rc = overlay_register( &sssvlv );
if ( rc != LDAP_SUCCESS ) {
- fprintf( stderr, "Failed to register server side sort overlay\n" );
+ Debug( LDAP_DEBUG_ANY, "Failed to register server side sort overlay\n", 0, 0, 0 );
}
}
else {
- fprintf( stderr, "Failed to register control %d\n", rc );
+ Debug( LDAP_DEBUG_ANY, "Failed to register control %d\n", rc, 0, 0 );
}
return rc;