]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/connection.c
zero out sml_managing any time a Modifications is built (use calloc?)
[openldap] / servers / slapd / connection.c
index d01e907d07328e581605e054561b5a813eb79a66..217ba8da08812a91fb7035201cb69957c8e85522 100644 (file)
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26,7 +26,9 @@
 #include "portable.h"
 
 #include <stdio.h>
+#ifdef HAVE_LIMITS_H
 #include <limits.h>
+#endif
 
 #include <ac/socket.h>
 #include <ac/errno.h>
@@ -34,7 +36,6 @@
 #include <ac/time.h>
 #include <ac/unistd.h>
 
-#include "ldap_pvt.h"
 #include "lutil.h"
 #include "slap.h"
 
@@ -49,6 +50,8 @@ static Connection *connections = NULL;
 static ldap_pvt_thread_mutex_t conn_nextid_mutex;
 static unsigned long conn_nextid = 0;
 
+static const char conn_lost_str[] = "connection lost";
+
 /* structure state (protected by connections_mutex) */
 #define SLAP_C_UNINITIALIZED   0x00    /* MUST BE ZERO (0) */
 #define SLAP_C_UNUSED                  0x01
@@ -190,7 +193,7 @@ int connections_shutdown(void)
                ldap_pvt_thread_mutex_lock( &connections[i].c_mutex );
 
                /* connections_mutex and c_mutex are locked */
-               connection_closing( &connections[i] );
+               connection_closing( &connections[i], "slapd shutdown" );
                connection_close( &connections[i] );
 
                ldap_pvt_thread_mutex_unlock( &connections[i].c_mutex );
@@ -221,7 +224,7 @@ int connections_timeout_idle(time_t now)
 
                if( difftime( c->c_activitytime+global_idletimeout, now) < 0 ) {
                        /* close it */
-                       connection_closing( c );
+                       connection_closing( c, "idletimeout" );
                        connection_close( c );
                        i++;
                }
@@ -491,6 +494,7 @@ long connection_init(
        if ( flags == CONN_IS_CLIENT ) {
                c->c_conn_state = SLAP_C_CLIENT;
                c->c_struct_state = SLAP_C_USED;
+               c->c_close_reason = "?";                        /* should never be needed */
                ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_SET_FD, &s );
                ldap_pvt_thread_mutex_unlock( &c->c_mutex );
                ldap_pvt_thread_mutex_unlock( &connections_mutex );
@@ -562,6 +566,7 @@ long connection_init(
 
        c->c_conn_state = SLAP_C_INACTIVE;
        c->c_struct_state = SLAP_C_USED;
+       c->c_close_reason = "?";                        /* should never be needed */
 
        c->c_ssf = c->c_transport_ssf = ssf;
        c->c_tls_ssf = 0;
@@ -597,19 +602,23 @@ void connection2anonymous( Connection *c )
                ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_SET_MAX_INCOMING, &max );
        }
 
-       if(c->c_authmech.bv_val != NULL ) {
-               free(c->c_authmech.bv_val);
+       if ( !BER_BVISNULL( &c->c_authmech ) ) {
+               ch_free(c->c_authmech.bv_val);
        }
        BER_BVZERO( &c->c_authmech );
 
-       if(c->c_dn.bv_val != NULL) {
-               free(c->c_dn.bv_val);
+       if ( !BER_BVISNULL( &c->c_dn ) ) {
+               ch_free(c->c_dn.bv_val);
        }
        BER_BVZERO( &c->c_dn );
-       if(c->c_ndn.bv_val != NULL) {
-               free(c->c_ndn.bv_val);
+       if ( !BER_BVISNULL( &c->c_ndn ) ) {
+               ch_free(c->c_ndn.bv_val);
        }
        BER_BVZERO( &c->c_ndn );
+       if ( !BER_BVISNULL( &c->c_sasl_authz_dn ) ) {
+               ber_memfree_x( c->c_sasl_authz_dn.bv_val, NULL );
+       }
+       BER_BVZERO( &c->c_sasl_authz_dn );
 
        c->c_authz_backend = NULL;
 }
@@ -620,6 +629,7 @@ connection_destroy( Connection *c )
        /* note: connections_mutex should be locked by caller */
        ber_socket_t    sd;
        unsigned long   connid;
+       const char              *close_reason;
 
        assert( connections != NULL );
        assert( c != NULL );
@@ -630,6 +640,7 @@ connection_destroy( Connection *c )
 
        /* only for stats (print -1 as "%lu" may give unexpected results ;) */
        connid = c->c_connid;
+       close_reason = c->c_close_reason;
 
        backend_connection_destroy(c);
 
@@ -667,9 +678,10 @@ connection_destroy( Connection *c )
        if ( sd != AC_SOCKET_INVALID ) {
                slapd_remove( sd, 1, 0 );
 
-               Statslog( LDAP_DEBUG_STATS,
-                       "conn=%lu fd=%ld closed\n",
-                       connid, (long) sd, 0, 0, 0 );
+               Statslog( LDAP_DEBUG_STATS, (close_reason
+                                                                        ? "conn=%lu fd=%ld closed (%s)\n"
+                                                                        : "conn=%lu fd=%ld closed\n"),
+                       connid, (long) sd, close_reason, 0, 0 );
        }
 
        ber_sockbuf_free( c->c_sb );
@@ -683,6 +695,7 @@ connection_destroy( Connection *c )
 
        c->c_conn_state = SLAP_C_INVALID;
        c->c_struct_state = SLAP_C_UNUSED;
+       c->c_close_reason = "?";                        /* should never be needed */
 
 #ifdef LDAP_SLAPI
        /* call destructors, then constructors; avoids unnecessary allocation */
@@ -711,10 +724,20 @@ static void connection_abandon( Connection *c )
 {
        /* c_mutex must be locked by caller */
 
-       Operation *o;
-
-       LDAP_STAILQ_FOREACH(o, &c->c_ops, o_next) {
+       Operation *o, *next, op = {0};
+       Opheader ohdr = {0};
+       SlapReply rs = {0};
+
+       op.o_hdr = &ohdr;
+       op.o_conn = c;
+       op.o_connid = c->c_connid;
+       op.o_tag = LDAP_REQ_ABANDON;
+       for ( o = LDAP_STAILQ_FIRST( &c->c_ops ); o; o=next ) {
+               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 );
        }
 
        /* remove pending operations */
@@ -725,7 +748,7 @@ static void connection_abandon( Connection *c )
        }
 }
 
-void connection_closing( Connection *c )
+void connection_closing( Connection *c, const char *why )
 {
        assert( connections != NULL );
        assert( c != NULL );
@@ -743,6 +766,7 @@ void connection_closing( Connection *c )
                        c->c_connid, sd, 0 );
                /* update state to closing */
                c->c_conn_state = SLAP_C_CLOSING;
+               c->c_close_reason = why;
 
                /* don't listen on this port anymore */
                slapd_clr_read( sd, 1 );
@@ -752,7 +776,15 @@ void connection_closing( Connection *c )
 
                /* wake write blocked operations */
                slapd_clr_write( sd, 1 );
-               ldap_pvt_thread_cond_signal( &c->c_write_cv );
+               if ( c->c_writewaiter ) {
+                       ldap_pvt_thread_cond_signal( &c->c_write_cv );
+                       ldap_pvt_thread_mutex_unlock( &c->c_mutex );
+                       ldap_pvt_thread_yield();
+                       ldap_pvt_thread_mutex_lock( &c->c_mutex );
+               }
+       } else if( why == NULL && c->c_close_reason == conn_lost_str ) {
+               /* Client closed connection after doing Unbind. */
+               c->c_close_reason = NULL;
        }
 }
 
@@ -863,43 +895,47 @@ void connection_done( Connection *c )
  */
 
 #ifdef SLAPD_MONITOR
-#ifdef HAVE_GMP
+/* FIXME: returns 0 in case of failure */
 #define INCR_OP_INITIATED(index) \
        do { \
                ldap_pvt_thread_mutex_lock( &slap_counters.sc_ops_mutex ); \
-               mpz_add_ui(slap_counters.sc_ops_initiated_[(index)], \
-                               slap_counters.sc_ops_initiated_[(index)], 1); \
+               ldap_pvt_mp_add_ulong(slap_counters.sc_ops_initiated_[(index)], 1); \
                ldap_pvt_thread_mutex_unlock( &slap_counters.sc_ops_mutex ); \
        } while (0)
 #define INCR_OP_COMPLETED(index) \
        do { \
                ldap_pvt_thread_mutex_lock( &slap_counters.sc_ops_mutex ); \
-               mpz_add_ui(slap_counters.sc_ops_completed, \
-                               slap_counters.sc_ops_completed, 1); \
-               mpz_add_ui(slap_counters.sc_ops_completed_[(index)], \
-                               slap_counters.sc_ops_completed_[(index)], 1); \
-               ldap_pvt_thread_mutex_unlock( &slap_counters.sc_ops_mutex ); \
-       } while (0)
-#else /* ! HAVE_GMP */
-#define INCR_OP_INITIATED(index) \
-       do { \
-               ldap_pvt_thread_mutex_lock( &slap_counters.sc_ops_mutex ); \
-               slap_counters.sc_ops_initiated_[(index)]++; \
+               ldap_pvt_mp_add_ulong(slap_counters.sc_ops_completed, 1); \
+               ldap_pvt_mp_add_ulong(slap_counters.sc_ops_completed_[(index)], 1); \
                ldap_pvt_thread_mutex_unlock( &slap_counters.sc_ops_mutex ); \
        } while (0)
+#else /* !SLAPD_MONITOR */
+#define INCR_OP_INITIATED(index) 
 #define INCR_OP_COMPLETED(index) \
        do { \
                ldap_pvt_thread_mutex_lock( &slap_counters.sc_ops_mutex ); \
-               slap_counters.sc_ops_completed++; \
-               slap_counters.sc_ops_completed_[(index)]++; \
+               ldap_pvt_mp_add_ulong(slap_counters.sc_ops_completed, 1); \
                ldap_pvt_thread_mutex_unlock( &slap_counters.sc_ops_mutex ); \
        } while (0)
-#endif /* ! HAVE_GMP */
-#else /* !SLAPD_MONITOR */
-#define INCR_OP_INITIATED(index) 
-#define INCR_OP_COMPLETED(index) 
 #endif /* !SLAPD_MONITOR */
 
+/*
+ * NOTE: keep in sync with enum in slapd.h
+ */
+static int (*opfun[])( Operation *op, SlapReply *rs ) = {
+       do_bind,
+       do_unbind,
+       do_add,
+       do_delete,
+       do_modrdn,
+       do_modify,
+       do_compare,
+       do_search,
+       do_abandon,
+       do_extended,
+       NULL
+};
+
 static void *
 connection_operation( void *ctx, void *arg_v )
 {
@@ -907,20 +943,15 @@ connection_operation( void *ctx, void *arg_v )
        Operation *op = arg_v;
        SlapReply rs = {REP_RESULT};
        ber_tag_t tag = op->o_tag;
-#ifdef SLAPD_MONITOR
-       ber_tag_t oldtag = tag;
-#endif /* SLAPD_MONITOR */
+       int opidx = -1;
        Connection *conn = op->o_conn;
        void *memctx = NULL;
        void *memctx_null = NULL;
        ber_len_t memsiz;
 
        ldap_pvt_thread_mutex_lock( &slap_counters.sc_ops_mutex );
-#ifdef HAVE_GMP
-       mpz_add_ui(slap_counters.sc_ops_initiated, slap_counters.sc_ops_initiated, 1);
-#else /* ! HAVE_GMP */
-       slap_counters.sc_ops_initiated++;
-#endif /* ! HAVE_GMP */
+       /* FIXME: returns 0 in case of failure */
+       ldap_pvt_mp_add_ulong(slap_counters.sc_ops_initiated, 1);
        ldap_pvt_thread_mutex_unlock( &slap_counters.sc_ops_mutex );
 
        op->o_threadctx = ctx;
@@ -930,7 +961,7 @@ connection_operation( void *ctx, void *arg_v )
        case LDAP_REQ_UNBIND:
        case LDAP_REQ_ADD:
        case LDAP_REQ_DELETE:
-       case LDAP_REQ_MODRDN:
+       case LDAP_REQ_MODDN:
        case LDAP_REQ_MODIFY:
        case LDAP_REQ_COMPARE:
        case LDAP_REQ_SEARCH:
@@ -968,7 +999,7 @@ connection_operation( void *ctx, void *arg_v )
 #endif
        memsiz = SLAP_SLAB_SIZE;
 
-       memctx = slap_sl_mem_create( memsiz, ctx );
+       memctx = slap_sl_mem_create( memsiz, SLAP_SLAB_STACK, ctx );
        op->o_tmpmemctx = memctx;
        op->o_tmpmfuncs = &slap_sl_mfuncs;
        if ( tag != LDAP_REQ_ADD && tag != LDAP_REQ_MODIFY ) {
@@ -981,53 +1012,43 @@ connection_operation( void *ctx, void *arg_v )
 
        switch ( tag ) {
        case LDAP_REQ_BIND:
-               INCR_OP_INITIATED(SLAP_OP_BIND);
-               rc = do_bind( op, &rs );
+               opidx = SLAP_OP_BIND;
                break;
 
        case LDAP_REQ_UNBIND:
-               INCR_OP_INITIATED(SLAP_OP_UNBIND);
-               rc = do_unbind( op, &rs );
+               opidx = SLAP_OP_UNBIND;
                break;
 
        case LDAP_REQ_ADD:
-               INCR_OP_INITIATED(SLAP_OP_ADD);
-               rc = do_add( op, &rs );
+               opidx = SLAP_OP_ADD;
                break;
 
        case LDAP_REQ_DELETE:
-               INCR_OP_INITIATED(SLAP_OP_DELETE);
-               rc = do_delete( op, &rs );
+               opidx = SLAP_OP_DELETE;
                break;
 
        case LDAP_REQ_MODRDN:
-               INCR_OP_INITIATED(SLAP_OP_MODRDN);
-               rc = do_modrdn( op, &rs );
+               opidx = SLAP_OP_MODRDN;
                break;
 
        case LDAP_REQ_MODIFY:
-               INCR_OP_INITIATED(SLAP_OP_MODIFY);
-               rc = do_modify( op, &rs );
+               opidx = SLAP_OP_MODIFY;
                break;
 
        case LDAP_REQ_COMPARE:
-               INCR_OP_INITIATED(SLAP_OP_COMPARE);
-               rc = do_compare( op, &rs );
+               opidx = SLAP_OP_COMPARE;
                break;
 
        case LDAP_REQ_SEARCH:
-               INCR_OP_INITIATED(SLAP_OP_SEARCH);
-               rc = do_search( op, &rs );
+               opidx = SLAP_OP_SEARCH;
                break;
 
        case LDAP_REQ_ABANDON:
-               INCR_OP_INITIATED(SLAP_OP_ABANDON);
-               rc = do_abandon( op, &rs );
+               opidx = SLAP_OP_ABANDON;
                break;
 
        case LDAP_REQ_EXTENDED:
-               INCR_OP_INITIATED(SLAP_OP_EXTENDED);
-               rc = do_extended( op, &rs );
+               opidx = SLAP_OP_EXTENDED;
                break;
 
        default:
@@ -1035,50 +1056,26 @@ connection_operation( void *ctx, void *arg_v )
                assert( 0 );
        }
 
+       assert( opidx > -1 );
+       INCR_OP_INITIATED( opidx );
+       rc = (*(opfun[opidx]))( op, &rs );
+
 operations_error:
-       if( rc == SLAPD_DISCONNECT ) tag = LBER_ERROR;
+       if ( rc == SLAPD_DISCONNECT ) {
+               tag = LBER_ERROR;
 
-#ifdef SLAPD_MONITOR
-       switch (oldtag) {
-       case LDAP_REQ_BIND:
-               INCR_OP_COMPLETED(SLAP_OP_BIND);
-               break;
-       case LDAP_REQ_UNBIND:
-               INCR_OP_COMPLETED(SLAP_OP_UNBIND);
-               break;
-       case LDAP_REQ_ADD:
-               INCR_OP_COMPLETED(SLAP_OP_ADD);
-               break;
-       case LDAP_REQ_DELETE:
-               INCR_OP_COMPLETED(SLAP_OP_DELETE);
-               break;
-       case LDAP_REQ_MODRDN:
-               INCR_OP_COMPLETED(SLAP_OP_MODRDN);
-               break;
-       case LDAP_REQ_MODIFY:
-               INCR_OP_COMPLETED(SLAP_OP_MODIFY);
-               break;
-       case LDAP_REQ_COMPARE:
-               INCR_OP_COMPLETED(SLAP_OP_COMPARE);
-               break;
-       case LDAP_REQ_SEARCH:
-               INCR_OP_COMPLETED(SLAP_OP_SEARCH);
-               break;
-       case LDAP_REQ_ABANDON:
-               INCR_OP_COMPLETED(SLAP_OP_ABANDON);
-               break;
-       case LDAP_REQ_EXTENDED:
-               INCR_OP_COMPLETED(SLAP_OP_EXTENDED);
-               break;
-       default:
-               /* not reachable */
-               assert( 0 );
+       } else if ( opidx > -1 ) {
+               /* increment completed operations count 
+                * only if operation was initiated
+                * and rc != SLAPD_DISCONNECT */
+               INCR_OP_COMPLETED( opidx );
        }
-#endif /* SLAPD_MONITOR */
-       ldap_pvt_thread_mutex_unlock( &slap_counters.sc_ops_mutex );
 
        if ( op->o_cancel == SLAP_CANCEL_REQ ) {
-               op->o_cancel = LDAP_TOO_LATE;
+               if ( rc == SLAPD_ABANDON )
+                       op->o_cancel = SLAP_CANCEL_ACK;
+               else
+                       op->o_cancel = LDAP_TOO_LATE;
        }
        while ( op->o_cancel != SLAP_CANCEL_NONE &&
                op->o_cancel != SLAP_CANCEL_DONE )
@@ -1090,31 +1087,18 @@ operations_error:
 
        ber_set_option( op->o_ber, LBER_OPT_BER_MEMCTX, &memctx_null );
 
-       if ( op->o_cancel != SLAP_CANCEL_ACK &&
-               ( op->o_sync_mode & SLAP_SYNC_PERSIST ) )
-       {
-               slap_sl_mem_detach( ctx, memctx );
-
-       } else if ( op->o_sync_slog_size != -1 ) {
-               slap_sl_mem_detach( ctx, memctx );
-               LDAP_STAILQ_REMOVE( &conn->c_ops, op, slap_op, o_next);
-               LDAP_STAILQ_NEXT(op, o_next) = NULL;
-               conn->c_n_ops_executing--;
-               conn->c_n_ops_completed++;
-
-       } else {
-               LDAP_STAILQ_REMOVE( &conn->c_ops, op, slap_op, o_next);
-               LDAP_STAILQ_NEXT(op, o_next) = NULL;
-               slap_op_free( op );
-               conn->c_n_ops_executing--;
-               conn->c_n_ops_completed++;
-       }
+       LDAP_STAILQ_REMOVE( &conn->c_ops, op, slap_op, o_next);
+       LDAP_STAILQ_NEXT(op, o_next) = NULL;
+       slap_op_free( op );
+       conn->c_n_ops_executing--;
+       conn->c_n_ops_completed++;
 
        switch( tag ) {
        case LBER_ERROR:
        case LDAP_REQ_UNBIND:
                /* c_mutex is locked */
-               connection_closing( conn );
+               connection_closing(
+                       conn, tag == LDAP_REQ_UNBIND ? NULL : "operations error" );
                break;
 
        case LDAP_REQ_BIND:
@@ -1173,6 +1157,7 @@ void connection_client_stop(
        c->c_listener = NULL;
        c->c_conn_state = SLAP_C_INVALID;
        c->c_struct_state = SLAP_C_UNUSED;
+       c->c_close_reason = "?";                        /* should never be needed */
        connection_return( c );
        slapd_remove( s, 0, 1 );
 }
@@ -1238,7 +1223,7 @@ int connection_read(ber_socket_t s)
                                s, rc, c->c_connid );
                        c->c_needs_tls_accept = 0;
                        /* connections_mutex and c_mutex are locked */
-                       connection_closing( c );
+                       connection_closing( c, "TLS negotiation failure" );
 
 #if 0
                        /* Drain input before close, to allow SSL error codes
@@ -1276,6 +1261,9 @@ int connection_read(ber_socket_t s)
                                        "unable to get TLS client DN, error=%d id=%lu\n",
                                        s, rc, c->c_connid );
                        }
+                       Statslog( LDAP_DEBUG_STATS,
+                               "conn=%lu TLS established tls_ssf=%u ssf=%u\n",
+                           c->c_connid, c->c_tls_ssf, c->c_ssf, 0, 0 );
                        slap_sasl_external( c, c->c_tls_ssf, &authid );
                        if ( authid.bv_val ) free( authid.bv_val );
                }
@@ -1310,7 +1298,7 @@ int connection_read(ber_socket_t s)
                                "error=%d id=%lu, closing\n",
                                s, rc, c->c_connid );
                        /* connections_mutex and c_mutex are locked */
-                       connection_closing( c );
+                       connection_closing( c, "SASL layer install failure" );
                        connection_close( c );
                        connection_return( c );
                        ldap_pvt_thread_mutex_unlock( &connections_mutex );
@@ -1339,7 +1327,7 @@ int connection_read(ber_socket_t s)
                        "connection_read(%d): input error=%d id=%lu, closing.\n",
                        s, rc, c->c_connid );
                /* connections_mutex and c_mutex are locked */
-               connection_closing( c );
+               connection_closing( c, conn_lost_str );
                connection_close( c );
                connection_return( c );
                ldap_pvt_thread_mutex_unlock( &connections_mutex );
@@ -1453,22 +1441,17 @@ connection_input(
        }
 #endif
        if(tag == LDAP_REQ_BIND) {
-               /* immediately abandon all exiting operations upon BIND */
+               /* immediately abandon all existing operations upon BIND */
                connection_abandon( conn );
        }
 
        op = slap_op_alloc( ber, msgid, tag, conn->c_n_ops_received++ );
 
        op->o_conn = conn;
-       op->o_assertion = NULL;
-       op->o_preread_attrs = NULL;
-       op->o_postread_attrs = NULL;
-       op->o_vrFilter = NULL;
        /* clear state if the connection is being reused from inactive */
        if ( conn->c_conn_state == SLAP_C_INACTIVE ) {
                memset( &conn->c_pagedresults_state, 0, sizeof( conn->c_pagedresults_state ) );
        }
-       op->o_pagedresults_state = conn->c_pagedresults_state;
 
        op->o_res_ber = NULL;
 
@@ -1508,16 +1491,32 @@ connection_input(
         * already pending ops, let them go first.  Abandon operations
         * get exceptions to some, but not all, cases.
         */
-       if (tag != LDAP_REQ_ABANDON && conn->c_conn_state == SLAP_C_CLOSING) {
-               defer = "closing";
-       } else if (tag != LDAP_REQ_ABANDON && conn->c_writewaiter) {
-               defer = "awaiting write";
-       } else if (conn->c_n_ops_executing >= connection_pool_max/2) {
-               defer = "too many executing";
-       } else if (conn->c_conn_state == SLAP_C_BINDING) {
-               defer = "binding";
-       } else if (tag != LDAP_REQ_ABANDON && conn->c_n_ops_pending) {
-               defer = "pending operations";
+       switch( tag ){
+       default:
+               /* Abandon and Unbind are exempt from these checks */
+               if (conn->c_conn_state == SLAP_C_CLOSING) {
+                       defer = "closing";
+                       break;
+               } else if (conn->c_writewaiter) {
+                       defer = "awaiting write";
+                       break;
+               } else if (conn->c_n_ops_pending) {
+                       defer = "pending operations";
+                       break;
+               }
+               /* FALLTHRU */
+       case LDAP_REQ_ABANDON:
+               /* Unbind is exempt from these checks */
+               if (conn->c_n_ops_executing >= connection_pool_max/2) {
+                       defer = "too many executing";
+                       break;
+               } else if (conn->c_conn_state == SLAP_C_BINDING) {
+                       defer = "binding";
+                       break;
+               }
+               /* FALLTHRU */
+       case LDAP_REQ_UNBIND:
+               break;
        }
 
        if( defer ) {
@@ -1561,7 +1560,7 @@ connection_resched( Connection *conn )
                ber_socket_t    sd;
                ber_sockbuf_ctrl( conn->c_sb, LBER_SB_OPT_GET_FD, &sd );
 
-               /* us trylock to avoid possible deadlock */
+               /* use trylock to avoid possible deadlock */
                rc = ldap_pvt_thread_mutex_trylock( &connections_mutex );
 
                if( rc ) {
@@ -1619,6 +1618,19 @@ connection_resched( Connection *conn )
        return 0;
 }
 
+static void
+connection_init_log_prefix( Operation *op )
+{
+       if ( op->o_connid == (unsigned long)(-1) ) {
+               snprintf( op->o_log_prefix, sizeof( op->o_log_prefix ),
+                               "conn=-1 op=%lu", op->o_opid );
+
+       } else {
+               snprintf( op->o_log_prefix, sizeof( op->o_log_prefix ),
+                               "conn=%lu op=%lu", op->o_connid, op->o_opid );
+       }
+}
+
 static int connection_op_activate( Operation *op )
 {
        int status;
@@ -1630,8 +1642,13 @@ static int connection_op_activate( Operation *op )
 
        if (!op->o_dn.bv_len) {
                op->o_authz = op->o_conn->c_authz;
-               ber_dupbv( &op->o_dn, &op->o_conn->c_dn );
-               ber_dupbv( &op->o_ndn, &op->o_conn->c_ndn );
+               if ( BER_BVISNULL( &op->o_conn->c_sasl_authz_dn )) {
+                       ber_dupbv( &op->o_dn, &op->o_conn->c_dn );
+                       ber_dupbv( &op->o_ndn, &op->o_conn->c_ndn );
+               } else {
+                       ber_dupbv( &op->o_dn, &op->o_conn->c_sasl_authz_dn );
+                       ber_dupbv( &op->o_ndn, &op->o_conn->c_sasl_authz_dn );
+               }
        }
        op->o_authtype = op->o_conn->c_authtype;
        ber_dupbv( &op->o_authmech, &op->o_conn->c_authmech );
@@ -1647,6 +1664,7 @@ static int connection_op_activate( Operation *op )
        }
 
        op->o_connid = op->o_conn->c_connid;
+       connection_init_log_prefix( op );
 
        LDAP_STAILQ_INSERT_TAIL( &op->o_conn->c_ops, op, o_next );
 
@@ -1666,6 +1684,7 @@ static int connection_op_activate( Operation *op )
 int connection_write(ber_socket_t s)
 {
        Connection *c;
+       Operation *op;
 
        assert( connections != NULL );
 
@@ -1673,8 +1692,6 @@ int connection_write(ber_socket_t s)
 
        c = connection_get( s );
 
-       slapd_clr_write( s, 0);
-
        if( c == NULL ) {
                Debug( LDAP_DEBUG_ANY,
                        "connection_write(%ld): no connection!\n",
@@ -1684,6 +1701,8 @@ int connection_write(ber_socket_t s)
                return -1;
        }
 
+       slapd_clr_write( s, 0);
+
        c->c_n_write++;
 
        Debug( LDAP_DEBUG_TRACE,
@@ -1697,6 +1716,26 @@ int connection_write(ber_socket_t s)
        if ( ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_NEEDS_WRITE, NULL ) ) {
                slapd_set_write( s, 1 );
        }
+       /* If there are ops pending because of a writewaiter, start
+        * one up.
+        */
+       while ((op = LDAP_STAILQ_FIRST( &c->c_pending_ops )) != NULL) {
+               if ( !c->c_writewaiter ) break;
+               if ( c->c_n_ops_executing > connection_pool_max/2 ) {
+                       break;
+               }
+               LDAP_STAILQ_REMOVE_HEAD( &c->c_pending_ops, o_next );
+               LDAP_STAILQ_NEXT(op, o_next) = NULL;
+               /* pending operations should not be marked for abandonment */
+               assert(!op->o_abandon);
+
+               c->c_n_ops_pending--;
+               c->c_n_ops_executing++;
+
+               connection_op_activate( op );
+
+               break;
+       }
        connection_return( c );
        ldap_pvt_thread_mutex_unlock( &connections_mutex );
        return 0;
@@ -1716,13 +1755,17 @@ connection_fake_init(
        conn->c_peer_domain = slap_empty_bv;
        conn->c_peer_name = slap_empty_bv;
 
+       memset(op, 0, OPERATION_BUFFER_SIZE);
+       op->o_hdr = (Opheader *)(op+1);
+       op->o_controls = (void **)(op->o_hdr+1);
        /* set memory context */
-       op->o_tmpmemctx = slap_sl_mem_create( SLAP_SLAB_SIZE, ctx );
+       op->o_tmpmemctx = slap_sl_mem_create(SLAP_SLAB_SIZE, SLAP_SLAB_STACK, ctx);
        op->o_tmpmfuncs = &slap_sl_mfuncs;
        op->o_threadctx = ctx;
 
        op->o_conn = conn;
        op->o_connid = op->o_conn->c_connid;
+       connection_init_log_prefix( op );
 
        op->o_time = slap_get_time();
 }