Partial revert of f30269f5d2e4bb5ee7486fe6542078d1b59dba6d

[openldap] / servers / slapd / result.c

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index 27a9db887b09bc598c38c0a0e3476e0e1b0ea854..854e822017ea13032de9e0a54846af181a2b7b1a 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-2011 The OpenLDAP Foundation.
+ * Copyright 1998-2012 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -369,9 +369,11 @@ static long send_ldap_ber(
 
                ldap_pvt_thread_mutex_unlock( &conn->c_write1_mutex );
                ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
+               ldap_pvt_thread_pool_idle( &connection_pool );
                ldap_pvt_thread_cond_wait( &conn->c_write2_cv, &conn->c_write2_mutex );
                conn->c_writewaiter = 0;
                ldap_pvt_thread_mutex_unlock( &conn->c_write2_mutex );
+               ldap_pvt_thread_pool_unidle( &connection_pool );
                ldap_pvt_thread_mutex_lock( &conn->c_write1_mutex );
                if ( conn->c_writers < 0 ) {
                        ret = 0;
@@ -570,7 +572,8 @@ send_ldap_response(
        int             rc = LDAP_SUCCESS;
        long    bytes;
 
-       if (( rs->sr_err == SLAPD_ABANDON || op->o_abandon ) && !op->o_cancel ) {
+       /* op was actually aborted, bypass everything if client didn't Cancel */
+       if (( rs->sr_err == SLAPD_ABANDON ) && !op->o_cancel ) {
                rc = SLAPD_ABANDON;
                goto clean2;
        }
@@ -582,6 +585,12 @@ send_ldap_response(
                }
        }
 
+       /* op completed, connection aborted, bypass sending response */
+       if ( op->o_abandon && !op->o_cancel ) {
+               rc = SLAPD_ABANDON;
+               goto clean2;
+       }
+
 #ifdef LDAP_CONNECTIONLESS
        if (op->o_conn && op->o_conn->c_is_udp)
                ber = op->o_res_ber;
@@ -1296,6 +1305,10 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
                                {
                                        continue;
                                }
+                               /* if DSA-specific and replicating, skip */
+                               if ( op->o_sync != SLAP_CONTROL_NONE &&
+                                       desc->ad_type->sat_usage == LDAP_SCHEMA_DSA_OPERATION )
+                                       continue;
                        } else {
                                if ( !userattrs && !ad_inlist( desc, rs->sr_attrs ) ) {
                                        continue;
@@ -1687,15 +1700,16 @@ str2result(
                                continue;
                        }
 
-                       while ( isspace( (unsigned char) next[ 0 ] ) ) next++;
-                       if ( next[ 0 ] != '\0' ) {
+                       while ( isspace( (unsigned char) next[ 0 ] ) && next[ 0 ] != '\n' )
+                               next++;
+                       if ( next[ 0 ] != '\0' && next[ 0 ] != '\n' ) {
                                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? */
+                       /* FIXME: what if it's larger than max int? */
                        *code = (int)retcode;
 
                } else if ( strncasecmp( s, "matched", STRLENOF( "matched" ) ) == 0 ) {