Add a Connection pointer to the Operation.

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 04cc49eaefa8608ff2313910057381029e470e82..374bc73f5cc861f9ac833e6d7090fab001678d01 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -1424,10 +1424,9 @@ connection_input(
 
        op = slap_op_alloc( ber, msgid, tag, conn->c_n_ops_received++ );
 
+       op->o_conn = conn;
        op->vrFilter = NULL;
-
        op->o_pagedresults_state = conn->c_pagedresults_state;
-
 #ifdef LDAP_CONNECTIONLESS
        op->o_peeraddr = peeraddr;
        if (cdn) {
@@ -1435,6 +1434,7 @@ connection_input(
            op->o_protocol = LDAP_VERSION2;
        }
 #endif
+
        if ( conn->c_conn_state == SLAP_C_BINDING
                || conn->c_conn_state == SLAP_C_CLOSING )
        {

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 96f7747cdc61507b7078e96ddab5161b98aae9c7..fc1bd20a43d3c92e379b3e33ea4cb68e44d5d85c 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -1508,6 +1508,7 @@ typedef struct slap_paged_state {
 typedef struct slap_op {
        unsigned long o_opid;   /* id of this operation */
        unsigned long o_connid; /* id of conn initiating this op */
+       struct slap_conn *o_conn;       /* connection spawning this op */
 
        ber_int_t       o_msgid;        /* msgid of the request */
        ber_int_t       o_protocol;     /* version of the LDAP protocol used by client */