diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 6e2c934847..b394cc062e 100644
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -92,6 +92,8 @@ static ldap_pvt_thread_start_t connection_operation;
  */
 int connections_init(void)
 {
+	int i;
+
 	assert( connections == NULL );
 
 	if( connections != NULL) {
@@ -126,6 +128,8 @@ int connections_init(void)
 	assert( connections[0].c_struct_state == SLAP_C_UNINITIALIZED );
 	assert( connections[dtblsize-1].c_struct_state == SLAP_C_UNINITIALIZED );
 
+	for (i=0; i<dtblsize; i++) connections[i].c_conn_idx = i;
+
 	/*
 	 * per entry initialization of the Connection array initialization
 	 * will be done by connection_init()
diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 202cc068ee..0112072d57 100644
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -2148,6 +2148,7 @@ typedef struct slap_listener Listener;
 typedef struct slap_conn {
 	int			c_struct_state; /* structure management state */
 	int			c_conn_state;	/* connection state */
+	int			c_conn_idx;		/* slot in connections array */
 
 	ldap_pvt_thread_mutex_t	c_mutex; /* protect the connection */
 	Sockbuf		*c_sb;			/* ber connection stuff		  */