]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/result.c
Unify use of BDB lockers
[openldap] / servers / slapd / result.c
index d1e79bf3396021f4edf08e868b3d673e4ed964d0..ae6a42dd0f5cd61cdcf04eefb0b5683b02046e60 100644 (file)
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -82,11 +82,7 @@ static char *v2ref( BerVarray ref, const char *text )
                }
        }
 
-       v2 = SLAP_MALLOC( len+i+sizeof("Referral:") );
-       if( v2 == NULL ) {
-               Debug( LDAP_DEBUG_ANY, "v2ref: SLAP_MALLOC failed", 0, 0, 0 );
-               return NULL;
-       }
+       v2 = ch_malloc( len+i+sizeof("Referral:") );
 
        if( text != NULL ) {
                strcpy(v2, text);
@@ -98,11 +94,7 @@ static char *v2ref( BerVarray ref, const char *text )
        len += sizeof("Referral:");
 
        for( i=0; ref[i].bv_val != NULL; i++ ) {
-               v2 = SLAP_REALLOC( v2, len + ref[i].bv_len + 1 );
-               if( v2 == NULL ) {
-                       Debug( LDAP_DEBUG_ANY, "v2ref: SLAP_MALLOC failed", 0, 0, 0 );
-                       return NULL;
-               }
+               v2 = ch_realloc( v2, len + ref[i].bv_len + 1 );
                v2[len-1] = '\n';
                AC_MEMCPY(&v2[len], ref[i].bv_val, ref[i].bv_len );
                len += ref[i].bv_len;
@@ -115,7 +107,8 @@ static char *v2ref( BerVarray ref, const char *text )
        return v2;
 }
 
-static ber_tag_t req2res( ber_tag_t tag )
+ber_tag_t
+slap_req2res( ber_tag_t tag )
 {
        switch( tag ) {
        case LDAP_REQ_ADD:
@@ -173,11 +166,11 @@ static long send_ldap_ber(
                        return 0;
                }
 
-               if ( ber_flush( conn->c_sb, ber, 0 ) == 0 ) {
+               if ( ber_flush2( conn->c_sb, ber, LBER_FLUSH_FREE_NEVER ) == 0 ) {
                        break;
                }
 
-               err = errno;
+               err = sock_errno();
 
                /*
                 * we got an error.  if it's ewouldblock, we need to
@@ -185,11 +178,11 @@ static long send_ldap_ber(
                 * it's a hard error and return.
                 */
 
-               Debug( LDAP_DEBUG_CONNS, "ber_flush failed errno=%d reason=\"%s\"\n",
+               Debug( LDAP_DEBUG_CONNS, "ber_flush2 failed errno=%d reason=\"%s\"\n",
                    err, sock_errstr(err), 0 );
 
                if ( err != EWOULDBLOCK && err != EAGAIN ) {
-                       connection_closing( conn );
+                       connection_closing( conn, "connection lost on write" );
 
                        ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
                        ldap_pvt_thread_mutex_unlock( &conn->c_write_mutex );
@@ -254,7 +247,7 @@ send_ldap_controls( Operation *o, BerElement *ber, LDAPControl **c )
                if( rc == -1 ) return rc;
        }
 
-#ifdef LDAP_DEVEL
+#ifdef SLAP_SORTED_RESULTS
        /* this is a hack to avoid having to modify op->s_ctrls */
        if( o->o_sortedresults ) {
                BerElementBuffer berbuf;
@@ -284,6 +277,101 @@ send_ldap_controls( Operation *o, BerElement *ber, LDAPControl **c )
        return rc;
 }
 
+/*
+ * slap_response_play()
+ *
+ * plays the callback list; rationale: a callback can
+ *   - remove itself from the list, by setting op->o_callback = NULL;
+ *     malloc()'ed callbacks should free themselves from inside the
+ *     sc_response() function.
+ *   - replace itself with another (list of) callback(s), by setting
+ *     op->o_callback = a new (list of) callback(s); in this case, it
+ *     is the callback's responsibility to to append existing subsequent
+ *     callbacks to the end of the list that is passed to the sc_response()
+ *     function.
+ *   - modify the list of subsequent callbacks by modifying the value
+ *     of the sc_next field from inside the sc_response() function; this
+ *     case does not require any handling from inside slap_response_play()
+ *
+ * To stop execution of the playlist, the sc_response() function must return
+ * a value different from SLAP_SC_CONTINUE.
+ *
+ * The same applies to slap_cleanup_play(); only, there is no means to stop
+ * execution of the playlist, since all cleanup functions must be called.
+ */
+static int
+slap_response_play(
+       Operation *op,
+       SlapReply *rs )
+{
+       int rc;
+
+       slap_callback   *sc = op->o_callback, **scp;
+
+       rc = SLAP_CB_CONTINUE;
+       for ( scp = &sc; *scp; ) {
+               slap_callback *sc_next = (*scp)->sc_next, **sc_nextp = &(*scp)->sc_next;
+
+               op->o_callback = *scp;
+               if ( op->o_callback->sc_response ) {
+                       rc = op->o_callback->sc_response( op, rs );
+                       if ( op->o_callback == NULL ) {
+                               /* the callback has been removed;
+                                * repair the list */
+                               *scp = sc_next;
+                               sc_nextp = scp;
+
+                       } else if ( op->o_callback != *scp ) {
+                               /* a new callback has been inserted
+                                * in place of the existing one; repair the list */
+                               *scp = op->o_callback;
+                               sc_nextp = scp;
+                       }
+                       if ( rc != SLAP_CB_CONTINUE ) break;
+               }
+               scp = sc_nextp;
+       }
+
+       op->o_callback = sc;
+       return rc;
+}
+
+static int
+slap_cleanup_play(
+       Operation *op,
+       SlapReply *rs )
+{
+       slap_callback   *sc = op->o_callback, **scp;
+
+       for ( scp = &sc; *scp; ) {
+               slap_callback *sc_next = (*scp)->sc_next, **sc_nextp = &(*scp)->sc_next;
+
+               op->o_callback = *scp;
+               if ( op->o_callback->sc_cleanup ) {
+                       (void)op->o_callback->sc_cleanup( op, rs );
+                       if ( op->o_callback == NULL ) {
+                               /* the callback has been removed;
+                                * repair the list */
+                               *scp = sc_next;
+                               sc_nextp = scp;
+
+                       } else if ( op->o_callback != *scp ) {
+                               /* a new callback has been inserted
+                                * after the existing one; repair the list */
+                               /* a new callback has been inserted
+                                * in place of the existing one; repair the list */
+                               *scp = op->o_callback;
+                               sc_nextp = scp;
+                       }
+                       /* don't care about the result; do all cleanup */
+               }
+               scp = sc_nextp;
+       }
+
+       op->o_callback = sc;
+       return LDAP_SUCCESS;
+}
+
 static int
 send_ldap_response(
        Operation *op,
@@ -294,31 +382,16 @@ send_ldap_response(
        int             rc = LDAP_SUCCESS;
        long    bytes;
 
-       if ( rs->sr_err == SLAPD_ABANDON ) {
+       if ( rs->sr_err == SLAPD_ABANDON || op->o_abandon ) {
                rc = SLAPD_ABANDON;
                goto clean2;
        }
 
        if ( op->o_callback ) {
-               int             first = 1;
-               slap_callback   *sc = op->o_callback,
-                               *sc_next = op->o_callback;
-
-               rc = SLAP_CB_CONTINUE;
-               for ( sc_next = op->o_callback; sc_next; op->o_callback = sc_next) {
-                       sc_next = op->o_callback->sc_next;
-                       if ( op->o_callback->sc_response ) {
-                               rc = op->o_callback->sc_response( op, rs );
-                               if ( first && op->o_callback == NULL ) {
-                                       sc = NULL;
-                               }
-                               if ( rc != SLAP_CB_CONTINUE ) break;
-                       }
-                       first = 0;
+               rc = slap_response_play( op, rs );
+               if ( rc != SLAP_CB_CONTINUE ) {
+                       goto clean2;
                }
-
-               op->o_callback = sc;
-               if ( rc != SLAP_CB_CONTINUE ) goto clean2;
        }
 
 #ifdef LDAP_CONNECTIONLESS
@@ -456,23 +529,9 @@ cleanup:;
 
 clean2:;
        if ( op->o_callback ) {
-               int             first = 1;
-               slap_callback   *sc = op->o_callback, *sc_next;
-
-               for ( sc_next = op->o_callback; sc_next; op->o_callback = sc_next) {
-                       sc_next = op->o_callback->sc_next;
-                       if ( op->o_callback->sc_cleanup ) {
-                               (void)op->o_callback->sc_cleanup( op, rs );
-                               if ( first && op->o_callback != sc ) {
-                                       sc = op->o_callback;
-                               }
-                       }
-                       first = 0;
-               }
-               op->o_callback = sc;
+               (void)slap_cleanup_play( op, rs );
        }
 
-
        if ( rs->sr_matched && rs->sr_flags & REP_MATCHED_MUSTBEFREED ) {
                free( (char *)rs->sr_matched );
                rs->sr_matched = NULL;
@@ -505,7 +564,7 @@ send_ldap_disconnect( Operation     *op, SlapReply *rs )
 
        if ( op->o_protocol < LDAP_VERSION3 ) {
                rs->sr_rspoid = NULL;
-               rs->sr_tag = req2res( op->o_tag );
+               rs->sr_tag = slap_req2res( op->o_tag );
                rs->sr_msgid = (rs->sr_tag != LBER_SEQUENCE) ? op->o_msgid : 0;
 
        } else {
@@ -532,7 +591,7 @@ slap_send_ldap_result( Operation *op, SlapReply *rs )
        rs->sr_type = REP_RESULT;
 
        /* Propagate Abandons so that cleanup callbacks can be processed */
-       if ( rs->sr_err == SLAPD_ABANDON )
+       if ( rs->sr_err == SLAPD_ABANDON || op->o_abandon )
                goto abandon;
 
        assert( !LDAP_API_ERROR( rs->sr_err ) );
@@ -557,11 +616,8 @@ slap_send_ldap_result( Operation *op, SlapReply *rs )
        assert( rs->sr_err != LDAP_PARTIAL_RESULTS );
 
        if ( rs->sr_err == LDAP_REFERRAL ) {
-#ifdef LDAP_CONTROL_X_DOMAIN_SCOPE
-               if( op->o_domain_scope ) {
-                       rs->sr_ref = NULL;
-               }
-#endif
+               if( op->o_domain_scope ) rs->sr_ref = NULL;
+
                if( rs->sr_ref == NULL ) {
                        rs->sr_err = LDAP_NO_SUCH_OBJECT;
                } else if ( op->o_protocol < LDAP_VERSION3 ) {
@@ -575,7 +631,7 @@ slap_send_ldap_result( Operation *op, SlapReply *rs )
                rs->sr_ref = NULL;
        }
 
-       rs->sr_tag = req2res( op->o_tag );
+       rs->sr_tag = slap_req2res( op->o_tag );
        rs->sr_msgid = (rs->sr_tag != LBER_SEQUENCE) ? op->o_msgid : 0;
 
 abandon:
@@ -610,10 +666,15 @@ send_ldap_sasl( Operation *op, SlapReply *rs )
                rs->sr_err,
                rs->sr_sasldata ? (long) rs->sr_sasldata->bv_len : -1, NULL );
 
-       rs->sr_tag = req2res( op->o_tag );
+       rs->sr_tag = slap_req2res( op->o_tag );
        rs->sr_msgid = (rs->sr_tag != LBER_SEQUENCE) ? op->o_msgid : 0;
 
-       send_ldap_response( op, rs );
+       if ( send_ldap_response( op, rs ) == SLAP_CB_CONTINUE ) {
+               Statslog( LDAP_DEBUG_STATS,
+                       "%s RESULT tag=%lu err=%d text=%s\n",
+                       op->o_log_prefix, rs->sr_tag, rs->sr_err,
+                       rs->sr_text ? rs->sr_text : "", 0 );
+       }
 }
 
 void
@@ -627,10 +688,15 @@ slap_send_ldap_extended( Operation *op, SlapReply *rs )
                rs->sr_rspoid ? rs->sr_rspoid : "",
                rs->sr_rspdata != NULL ? rs->sr_rspdata->bv_len : 0 );
 
-       rs->sr_tag = req2res( op->o_tag );
+       rs->sr_tag = slap_req2res( op->o_tag );
        rs->sr_msgid = (rs->sr_tag != LBER_SEQUENCE) ? op->o_msgid : 0;
 
-       send_ldap_response( op, rs );
+       if ( send_ldap_response( op, rs ) == SLAP_CB_CONTINUE ) {
+               Statslog( LDAP_DEBUG_STATS,
+                       "%s RESULT oid=%s err=%d text=%s\n",
+                       op->o_log_prefix, rs->sr_rspoid ? rs->sr_rspoid : "",
+                       rs->sr_err, rs->sr_text ? rs->sr_text : "", 0 );
+       }
 }
 
 void
@@ -644,16 +710,31 @@ slap_send_ldap_intermediate( Operation *op, SlapReply *rs )
                rs->sr_rspdata != NULL ? rs->sr_rspdata->bv_len : 0 );
        rs->sr_tag = LDAP_RES_INTERMEDIATE;
        rs->sr_msgid = op->o_msgid;
-       send_ldap_response( op, rs );
+       if ( send_ldap_response( op, rs ) == SLAP_CB_CONTINUE ) {
+               Statslog( LDAP_DEBUG_STATS2,
+                       "%s INTERM oid=%s\n",
+                       op->o_log_prefix,
+                       rs->sr_rspoid ? rs->sr_rspoid : "", 0, 0, 0 );
+       }
 }
 
+/*
+ * returns:
+ *
+ * LDAP_SUCCESS                        entry sent
+ * LDAP_OTHER                  entry not sent (other)
+ * LDAP_INSUFFICIENT_ACCESS    entry not sent (ACL)
+ * LDAP_UNAVAILABLE            entry not sent (connection closed)
+ * LDAP_SIZELIMIT_EXCEEDED     entry not sent (caller must send sizelimitExceeded)
+ */
+
 int
 slap_send_search_entry( Operation *op, SlapReply *rs )
 {
        BerElementBuffer berbuf;
        BerElement      *ber = (BerElement *) &berbuf;
        Attribute       *a;
-       int             i, j, rc=-1, bytes;
+       int             i, j, rc = LDAP_UNAVAILABLE, bytes;
        char            *edn;
        int             userattrs;
        AccessControlState acl_state = ACL_STATE_INIT;
@@ -665,7 +746,11 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
         * e_flags: array of a_flags
         */
        char **e_flags = NULL;
-       
+
+       if ( op->ors_slimit >= 0 && rs->sr_nentries >= op->ors_slimit ) {
+               return LDAP_SIZELIMIT_EXCEEDED;
+       }
+
        rs->sr_type = REP_SEARCH;
 
        /* eventually will loop through generated operational attribute types
@@ -674,7 +759,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
        /* NOTE: moved before overlays callback circling because
         * they may modify entry and other stuff in rs */
        /* check for special all operational attributes ("+") type */
-       /* FIXME: maybe we could se this flag at the operation level;
+       /* FIXME: maybe we could set this flag at the operation level;
         * however, in principle the caller of send_search_entry() may
         * change the attribute list at each call */
        rs->sr_attr_flags = slap_attr_flags( rs->sr_attrs );
@@ -685,26 +770,10 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
        }
 
        if ( op->o_callback ) {
-               int             first = 1;
-               slap_callback   *sc = op->o_callback,
-                               *sc_next = op->o_callback;
-
-               rc = SLAP_CB_CONTINUE;
-               for ( sc_next = op->o_callback; sc_next; op->o_callback = sc_next )
-               {
-                       sc_next = op->o_callback->sc_next;
-                       if ( op->o_callback->sc_response ) {
-                               rc = op->o_callback->sc_response( op, rs );
-                               if ( first && op->o_callback == NULL ) {
-                                       sc = NULL;
-                               }
-                               if ( rc != SLAP_CB_CONTINUE ) break;
-                       }
-                       first = 0;
+               rc = slap_response_play( op, rs );
+               if ( rc != SLAP_CB_CONTINUE ) {
+                       goto error_return;
                }
-
-               op->o_callback = sc;
-               if ( rc != SLAP_CB_CONTINUE ) goto error_return;
        }
 
        Debug( LDAP_DEBUG_TRACE, "=> send_search_entry: conn %lu dn=\"%s\"%s\n",
@@ -718,7 +787,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
                        "send_search_entry: conn %lu access to entry (%s) not allowed\n", 
                        op->o_connid, rs->sr_entry->e_name.bv_val, 0 );
 
-               rc = 1;
+               rc = LDAP_INSUFFICIENT_ACCESS;
                goto error_return;
        }
 
@@ -764,6 +833,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
 
                if ( op->o_res_ber == NULL ) ber_free_buf( ber );
                send_ldap_error( op, rs, LDAP_OTHER, "encoding DN error" );
+               rc = rs->sr_err;
                goto error_return;
        }
 
@@ -811,6 +881,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
                                if ( op->o_res_ber == NULL ) ber_free_buf( ber );
                                send_ldap_error( op, rs, LDAP_OTHER,
                                        "matched values filtering error" );
+                               rc = rs->sr_err;
                                goto error_return;
                        }
                }
@@ -821,7 +892,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
                int finish = 0;
 
                if ( rs->sr_attrs == NULL ) {
-                       /* all attrs request, skip operational attributes */
+                       /* all user attrs request, skip operational attributes */
                        if( is_at_operational( desc->ad_type ) ) {
                                continue;
                        }
@@ -830,14 +901,13 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
                        /* specific attrs requested */
                        if ( is_at_operational( desc->ad_type ) ) {
                                if ( !SLAP_OPATTRS( rs->sr_attr_flags ) &&
-                                               !ad_inlist( desc, rs->sr_attrs ) )
+                                       !ad_inlist( desc, rs->sr_attrs ) )
                                {
                                        continue;
                                }
 
                        } else {
-                               if ( !userattrs && !ad_inlist( desc, rs->sr_attrs ) )
-                               {
+                               if ( !userattrs && !ad_inlist( desc, rs->sr_attrs ) ) {
                                        continue;
                                }
                        }
@@ -861,6 +931,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
                                if ( op->o_res_ber == NULL ) ber_free_buf( ber );
                                send_ldap_error( op, rs, LDAP_OTHER,
                                        "encoding description error");
+                               rc = rs->sr_err;
                                goto error_return;
                        }
                        finish = 1;
@@ -894,6 +965,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
                                                if ( op->o_res_ber == NULL ) ber_free_buf( ber );
                                                send_ldap_error( op, rs, LDAP_OTHER,
                                                        "encoding description error");
+                                               rc = rs->sr_err;
                                                goto error_return;
                                        }
                                }
@@ -905,6 +977,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
                                        if ( op->o_res_ber == NULL ) ber_free_buf( ber );
                                        send_ldap_error( op, rs, LDAP_OTHER,
                                                "encoding values error" );
+                                       rc = rs->sr_err;
                                        goto error_return;
                                }
                        }
@@ -917,6 +990,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
 
                        if ( op->o_res_ber == NULL ) ber_free_buf( ber );
                        send_ldap_error( op, rs, LDAP_OTHER, "encode end error" );
+                       rc = rs->sr_err;
                        goto error_return;
                }
        }
@@ -970,6 +1044,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
                                if ( op->o_res_ber == NULL ) ber_free_buf( ber );
                                send_ldap_error( op, rs, LDAP_OTHER,
                                        "matched values filtering error" );
+                               rc = rs->sr_err;
                                goto error_return;
                        }
                }
@@ -979,7 +1054,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
                AttributeDescription *desc = a->a_desc;
 
                if ( rs->sr_attrs == NULL ) {
-                       /* all attrs request, skip operational attributes */
+                       /* all user attrs request, skip operational attributes */
                        if( is_at_operational( desc->ad_type ) ) {
                                continue;
                        }
@@ -988,7 +1063,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
                        /* specific attrs requested */
                        if( is_at_operational( desc->ad_type ) ) {
                                if ( !SLAP_OPATTRS( rs->sr_attr_flags ) && 
-                                               !ad_inlist( desc, rs->sr_attrs ) )
+                                       !ad_inlist( desc, rs->sr_attrs ) )
                                {
                                        continue;
                                }
@@ -1019,6 +1094,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
                        if ( op->o_res_ber == NULL ) ber_free_buf( ber );
                        send_ldap_error( op, rs, LDAP_OTHER,
                                "encoding description error" );
+                       rc = rs->sr_err;
                        goto error_return;
                }
 
@@ -1047,6 +1123,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
                                        if ( op->o_res_ber == NULL ) ber_free_buf( ber );
                                        send_ldap_error( op, rs, LDAP_OTHER,
                                                "encoding values error" );
+                                       rc = rs->sr_err;
                                        goto error_return;
                                }
                        }
@@ -1059,6 +1136,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
 
                        if ( op->o_res_ber == NULL ) ber_free_buf( ber );
                        send_ldap_error( op, rs, LDAP_OTHER, "encode end error" );
+                       rc = rs->sr_err;
                        goto error_return;
                }
        }
@@ -1093,7 +1171,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
 
                if ( op->o_res_ber == NULL ) ber_free_buf( ber );
                send_ldap_error( op, rs, LDAP_OTHER, "encode entry end error" );
-               rc = 1;
+               rc = rs->sr_err;
                goto error_return;
        }
 
@@ -1112,7 +1190,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
                                "send_search_entry: conn %lu  ber write failed.\n", 
                                op->o_connid, 0, 0 );
 
-                       rc = -1;
+                       rc = LDAP_UNAVAILABLE;
                        goto error_return;
                }
                rs->sr_nentries++;
@@ -1130,24 +1208,11 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
        Debug( LDAP_DEBUG_TRACE,
                "<= send_search_entry: conn %lu exit.\n", op->o_connid, 0, 0 );
 
-       rc = 0;
+       rc = LDAP_SUCCESS;
 
 error_return:;
        if ( op->o_callback ) {
-               int             first = 1;
-               slap_callback   *sc = op->o_callback, *sc_next;
-
-               for ( sc_next = op->o_callback; sc_next; op->o_callback = sc_next) {
-                       sc_next = op->o_callback->sc_next;
-                       if ( op->o_callback->sc_cleanup ) {
-                               (void)op->o_callback->sc_cleanup( op, rs );
-                               if ( first && op->o_callback != sc ) {
-                                       sc = op->o_callback;
-                               }
-                       }
-                       first = 0;
-               }
-               op->o_callback = sc;
+               (void)slap_cleanup_play( op, rs );
        }
 
        if ( e_flags ) {
@@ -1191,25 +1256,10 @@ slap_send_search_reference( Operation *op, SlapReply *rs )
 
        rs->sr_type = REP_SEARCHREF;
        if ( op->o_callback ) {
-               int             first = 1;
-               slap_callback   *sc = op->o_callback,
-                               *sc_next = op->o_callback;
-
-               rc = SLAP_CB_CONTINUE;
-               for ( sc_next = op->o_callback; sc_next; op->o_callback = sc_next) {
-                       sc_next = op->o_callback->sc_next;
-                       if ( op->o_callback->sc_response ) {
-                               rc = op->o_callback->sc_response( op, rs );
-                               if ( first && op->o_callback == NULL ) {
-                                       sc = NULL;
-                               }
-                               if ( rc != SLAP_CB_CONTINUE ) break;
-                       }
-                       first = 0;
+               rc = slap_response_play( op, rs );
+               if ( rc != SLAP_CB_CONTINUE ) {
+                       goto rel;
                }
-
-               op->o_callback = sc;
-               if ( rc != SLAP_CB_CONTINUE ) goto rel;
        }
 
        Debug( LDAP_DEBUG_TRACE,
@@ -1237,7 +1287,6 @@ slap_send_search_reference( Operation *op, SlapReply *rs )
                goto rel;
        }
 
-#ifdef LDAP_CONTROL_X_DOMAIN_SCOPE
        if( op->o_domain_scope ) {
                Debug( LDAP_DEBUG_ANY,
                        "send_search_reference: domainScope control in (%s)\n", 
@@ -1245,7 +1294,6 @@ slap_send_search_reference( Operation *op, SlapReply *rs )
                rc = 0;
                goto rel;
        }
-#endif
 
        if( rs->sr_ref == NULL ) {
                Debug( LDAP_DEBUG_ANY,
@@ -1311,37 +1359,37 @@ slap_send_search_reference( Operation *op, SlapReply *rs )
        bytes = send_ldap_ber( op->o_conn, ber );
        ber_free_buf( ber );
 
-       ldap_pvt_thread_mutex_lock( &slap_counters.sc_sent_mutex );
-       ldap_pvt_mp_add_ulong( slap_counters.sc_bytes, (unsigned long)bytes );
-       ldap_pvt_mp_add_ulong( slap_counters.sc_refs, 1 );
-       ldap_pvt_mp_add_ulong( slap_counters.sc_pdu, 1 );
-       ldap_pvt_thread_mutex_unlock( &slap_counters.sc_sent_mutex );
+       if ( bytes < 0 ) {
+               rc = LDAP_UNAVAILABLE;
+       } else {
+               ldap_pvt_thread_mutex_lock( &slap_counters.sc_sent_mutex );
+               ldap_pvt_mp_add_ulong( slap_counters.sc_bytes, (unsigned long)bytes );
+               ldap_pvt_mp_add_ulong( slap_counters.sc_refs, 1 );
+               ldap_pvt_mp_add_ulong( slap_counters.sc_pdu, 1 );
+               ldap_pvt_thread_mutex_unlock( &slap_counters.sc_sent_mutex );
+       }
 #ifdef LDAP_CONNECTIONLESS
        }
 #endif
+       if ( rs->sr_ref != NULL ) {
+               int     r;
+
+               for ( r = 0; !BER_BVISNULL( &rs->sr_ref[ r ] ); r++ ) {
+                       Statslog( LDAP_DEBUG_STATS2, "%s REF #%d \"%s\"\n",
+                               op->o_log_prefix, r, rs->sr_ref[0].bv_val,
+                               0, 0 );
+               }
 
-       Statslog( LDAP_DEBUG_STATS2, "%s REF dn=\"%s\"\n",
-               op->o_log_prefix, rs->sr_entry ? rs->sr_entry->e_dn : "(null)",
-               0, 0, 0 );
+       } else {
+               Statslog( LDAP_DEBUG_STATS2, "%s REF \"(null)\"\n",
+                       op->o_log_prefix, 0, 0, 0, 0 );
+       }
 
        Debug( LDAP_DEBUG_TRACE, "<= send_search_reference\n", 0, 0, 0 );
 
 rel:
        if ( op->o_callback ) {
-               int             first = 1;
-               slap_callback   *sc = op->o_callback, *sc_next;
-
-               for ( sc_next = op->o_callback; sc_next; op->o_callback = sc_next) {
-                       sc_next = op->o_callback->sc_next;
-                       if ( op->o_callback->sc_cleanup ) {
-                               (void)op->o_callback->sc_cleanup( op, rs );
-                               if ( first && op->o_callback != sc ) {
-                                       sc = op->o_callback;
-                               }
-                       }
-                       first = 0;
-               }
-               op->o_callback = sc;
+               (void)slap_cleanup_play( op, rs );
        }
 
        return rc;
@@ -1379,9 +1427,43 @@ str2result(
                }
 
                if ( strncasecmp( s, "code", STRLENOF( "code" ) ) == 0 ) {
-                       if ( c != NULL ) {
-                               *code = atoi( c );
+                       char    *next = NULL;
+                       long    retcode;
+
+                       if ( c == NULL ) {
+                               Debug( LDAP_DEBUG_ANY, "str2result (%s) missing value\n",
+                                   s, 0, 0 );
+                               rc = -1;
+                               continue;
                        }
+
+                       while ( isspace( (unsigned char) c[ 0 ] ) ) c++;
+                       if ( c[ 0 ] == '\0' ) {
+                               Debug( LDAP_DEBUG_ANY, "str2result (%s) missing or empty value\n",
+                                   s, 0, 0 );
+                               rc = -1;
+                               continue;
+                       }
+
+                       retcode = strtol( c, &next, 10 );
+                       if ( next == NULL || next == c ) {
+                               Debug( LDAP_DEBUG_ANY, "str2result (%s) unable to parse value\n",
+                                   s, 0, 0 );
+                               rc = -1;
+                               continue;
+                       }
+
+                       while ( isspace( (unsigned char) next[ 0 ] ) ) next++;
+                       if ( next[ 0 ] != '\0' ) {
+                               Debug( LDAP_DEBUG_ANY, "str2result (%s) extra cruft after value\n",
+                                   s, 0, 0 );
+                               rc = -1;
+                               continue;
+                       }
+
+                       /* FIXME: what if it's larger that max int? */
+                       *code = (int)retcode;
+
                } else if ( strncasecmp( s, "matched", STRLENOF( "matched" ) ) == 0 ) {
                        if ( c != NULL ) {
                                *matched = c;
@@ -1423,16 +1505,18 @@ int slap_read_controls(
                op->o_preread_attrs : op->o_postread_attrs; 
 
        bv.bv_len = entry_flatsize( rs->sr_entry, 0 );
-       bv.bv_val = op->o_tmpalloc(bv.bv_len, op->o_tmpmemctx );
+       bv.bv_val = op->o_tmpalloc( bv.bv_len, op->o_tmpmemctx );
 
        ber_init2( ber, &bv, LBER_USE_DER );
        ber_set_option( ber, LBER_OPT_BER_MEMCTX, &op->o_tmpmemctx );
 
        /* create new operation */
        myop = *op;
-       myop.o_bd = NULL;
+       /* FIXME: o_bd needed for ACL */
+       myop.o_bd = op->o_bd;
        myop.o_res_ber = ber;
        myop.o_callback = NULL;
+       myop.ors_slimit = 1;
 
        rc = slap_send_search_entry( &myop, rs );
        if( rc ) return rc;