Commit of the Proxy Cache contribution (ITS#2062)

[openldap] / servers / slapd / connection.c

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 13bdbe36fcb11cd604d411ae1b0503b147fecf03..20da8a2e5cbbf9d14e759e065178bc0d76e75797 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -416,6 +416,9 @@ long connection_init(
                c->c_send_search_result = slap_send_search_result;
                c->c_send_search_reference = slap_send_search_reference;
                c->c_send_ldap_extended = slap_send_ldap_extended;
+#ifdef LDAP_RES_INTERMEDIATE_RESP
+               c->c_send_ldap_intermediate_resp = slap_send_ldap_intermediate_resp;
+#endif
 
                c->c_authmech.bv_val = NULL;
                c->c_authmech.bv_len = 0;
@@ -1024,13 +1027,17 @@ operations_error:
 #endif /* SLAPD_MONITOR */
        ldap_pvt_thread_mutex_unlock( &num_ops_mutex );
 
-       if ( arg->co_op->o_cancel == LDAP_CANCEL_REQ )
+#ifdef LDAP_EXOP_X_CANCEL
+       if ( arg->co_op->o_cancel == SLAP_CANCEL_REQ ) {
                arg->co_op->o_cancel = LDAP_TOO_LATE;
+       }
 
-       while ( arg->co_op->o_cancel != LDAP_CANCEL_NONE &&
-               arg->co_op->o_cancel != LDAP_CANCEL_DONE ) {
-                       ldap_pvt_thread_yield();
+       while ( arg->co_op->o_cancel != SLAP_CANCEL_NONE &&
+               arg->co_op->o_cancel != SLAP_CANCEL_DONE )
+       {
+               ldap_pvt_thread_yield();
        }
+#endif
 
        ldap_pvt_thread_mutex_lock( &conn->c_mutex );
 
@@ -1039,12 +1046,26 @@ operations_error:
 
        LDAP_STAILQ_REMOVE( &conn->c_ops, arg->co_op, slap_op, o_next);
        LDAP_STAILQ_NEXT(arg->co_op, o_next) = NULL;
+
+#if defined(LDAP_CLIENT_UPDATE) || defined(LDAP_SYNC)
+       if ( arg->co_op->o_cancel == SLAP_CANCEL_ACK )
+               goto co_op_free;
+#endif
 #ifdef LDAP_CLIENT_UPDATE
-       if ( !( arg->co_op->o_clientupdate_type & SLAP_LCUP_PERSIST ) )
-#endif /* LDAP_CLIENT_UPDATE */
-       {
-               slap_op_free( arg->co_op );
-       }
+       if ( ( arg->co_op->o_clientupdate_type & SLAP_LCUP_PERSIST ) )
+               goto no_co_op_free;
+#endif
+#ifdef LDAP_SYNC
+       if ( ( arg->co_op->o_sync_mode & SLAP_SYNC_PERSIST ) )
+               goto no_co_op_free;
+#endif
+
+co_op_free:
+
+       slap_op_free( arg->co_op );
+
+no_co_op_free:
+
        arg->co_op = NULL;
        arg->co_conn = NULL;
        free( (char *) arg );
@@ -1414,21 +1435,22 @@ connection_input(
 
        op->o_conn = conn;
        op->vrFilter = NULL;
+#ifdef LDAP_CONTROL_PAGEDRESULTS
        op->o_pagedresults_state = conn->c_pagedresults_state;
+#endif
 #ifdef LDAP_CONNECTIONLESS
-       op->o_peeraddr = peeraddr;
-       if (cdn ) {
-           ber_str2bv( cdn, 0, 1, &op->o_dn );
-           op->o_protocol = LDAP_VERSION2;
-       }
        if (conn->c_is_udp) {
                int rc;
 
+               if ( cdn ) {
+                   ber_str2bv( cdn, 0, 1, &op->o_dn );
+                   op->o_protocol = LDAP_VERSION2;
+               }
                op->o_res_ber = ber_alloc_t( LBER_USE_DER );
                if (op->o_res_ber == NULL)
                        return 1;
 
-               rc = ber_write(op->o_res_ber, (char *)&op->o_peeraddr, sizeof(struct sockaddr), 0);
+               rc = ber_write(op->o_res_ber, (char *)&peeraddr, sizeof(struct sockaddr), 0);
                if (rc != sizeof(struct sockaddr)) {
 #ifdef NEW_LOGGING
                        LDAP_LOG( CONNECTION, INFO, 
@@ -1440,8 +1462,8 @@ connection_input(
                        return 1;
                }
 
-               if (conn->c_protocol == LDAP_VERSION2) {
-                       rc = ber_printf(op->o_res_ber, "{i{" /*}}*/, op->o_msgid);
+               if (op->o_protocol == LDAP_VERSION2) {
+                       rc = ber_printf(op->o_res_ber, "{is{" /*}}*/, op->o_msgid, "");
                        if (rc == -1) {
 #ifdef NEW_LOGGING
                                LDAP_LOG( CONNECTION, INFO,