Unify use of BDB lockers

[openldap] / servers / slapd / result.c

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index e412c6169eecf7a9f70113ac3bb33232c846c056..ae6a42dd0f5cd61cdcf04eefb0b5683b02046e60 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2006 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -36,7 +36,6 @@
 #include <ac/unistd.h>
 
 #include "slap.h"
-#include "lutil.h"
 
 const struct berval slap_dummy_bv = BER_BVNULL;
 
@@ -171,7 +170,7 @@ static long send_ldap_ber(
                        break;
                }
 
-               err = errno;
+               err = sock_errno();
 
                /*
                 * we got an error.  if it's ewouldblock, we need to
@@ -248,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;
@@ -307,7 +306,6 @@ slap_response_play(
 {
        int rc;
 
-#ifdef LDAP_DEVEL
        slap_callback   *sc = op->o_callback, **scp;
 
        rc = SLAP_CB_CONTINUE;
@@ -335,27 +333,6 @@ slap_response_play(
        }
 
        op->o_callback = sc;
-#else /* ! LDAP_DEVEL */
-       slap_callback   *sc = op->o_callback, **sc_prev = &sc, *sc_next;
-
-       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 ) {
-                       slap_callback *sc2 = op->o_callback;
-                       rc = op->o_callback->sc_response( op, rs );
-                       if ( op->o_callback != sc2 ) {
-                               *sc_prev = op->o_callback;
-                       }
-                       if ( rc != SLAP_CB_CONTINUE || !op->o_callback ) break;
-                       if ( op->o_callback != sc2 ) continue;
-               }
-               sc_prev = &op->o_callback->sc_next;
-       }
-
-       op->o_callback = sc;
-#endif /* ! LDAP_DEVEL */
-
        return rc;
 }
 
@@ -364,7 +341,6 @@ slap_cleanup_play(
        Operation *op,
        SlapReply *rs )
 {
-#ifdef LDAP_DEVEL
        slap_callback   *sc = op->o_callback, **scp;
 
        for ( scp = &sc; *scp; ) {
@@ -393,26 +369,6 @@ slap_cleanup_play(
        }
 
        op->o_callback = sc;
-#else /* ! LDAP_DEVEL */
-       slap_callback   *sc = op->o_callback, **sc_prev = &sc, *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 ) {
-                       slap_callback *sc2 = op->o_callback;
-                       (void)op->o_callback->sc_cleanup( op, rs );
-                       if ( op->o_callback != sc2 ) {
-                               *sc_prev = op->o_callback;
-                       }
-                       if ( !op->o_callback ) break;
-                       if ( op->o_callback != sc2 ) continue;
-               }
-               sc_prev = &op->o_callback->sc_next;
-       }
-
-       op->o_callback = sc;
-#endif /* ! LDAP_DEVEL */
-
        return LDAP_SUCCESS;
 }
 
@@ -1403,11 +1359,15 @@ 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
@@ -1467,9 +1427,43 @@ str2result(
                }
 
                if ( strncasecmp( s, "code", STRLENOF( "code" ) ) == 0 ) {
-                       if ( c != NULL && lutil_atoi( code, c ) != 0 ) {
-                               goto bailout;
+                       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;
@@ -1479,7 +1473,6 @@ str2result(
                                *info = c;
                        }
                } else {
-bailout:;
                        Debug( LDAP_DEBUG_ANY, "str2result (%s) unknown\n",
                            s, 0, 0 );
 
@@ -1512,14 +1505,15 @@ 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;