From: Howard Chu <hyc@openldap.org>
Date: Tue, 27 Jan 2009 18:16:28 +0000 (+0000)
Subject: Revert prev commit, unnecessary
X-Git-Tag: ACLCHECK_0~930
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=1a1d226dadc60ad651d0c7d6a1aa71c1da3380d8;p=openldap

Revert prev commit, unnecessary
---

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index ae781817ab..9e2130d6de 100644
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -1240,7 +1240,7 @@ int connection_read_activate( ber_socket_t s )
 	 * thread reads data on it. Otherwise the listener thread will repeatedly
 	 * submit the same event on it to the pool.
 	 */
-	rc = slapd_ack_read( s, 0 );
+	rc = slapd_clr_read( s, 0 );
 	if ( rc )
 		return rc;
 
@@ -1844,7 +1844,7 @@ int connection_write(ber_socket_t s)
 
 	assert( connections != NULL );
 
-	slapd_ack_write( s, 0 );
+	slapd_clr_write( s, 0 );
 
 	c = connection_get( s );
 	if( c == NULL ) {
diff --git a/servers/slapd/proto-slap.h b/servers/slapd/proto-slap.h
index 3bfe126370..5837bb50f2 100644
--- a/servers/slapd/proto-slap.h
+++ b/servers/slapd/proto-slap.h
@@ -831,10 +831,8 @@ LDAP_SLAPD_F (void) slap_wake_listener LDAP_P((void));
 
 LDAP_SLAPD_F (void) slapd_set_write LDAP_P((ber_socket_t s, int wake));
 LDAP_SLAPD_F (void) slapd_clr_write LDAP_P((ber_socket_t s, int wake));
-LDAP_SLAPD_F (void) slapd_ack_write LDAP_P((ber_socket_t s, int wake));
 LDAP_SLAPD_F (void) slapd_set_read LDAP_P((ber_socket_t s, int wake));
 LDAP_SLAPD_F (int) slapd_clr_read LDAP_P((ber_socket_t s, int wake));
-LDAP_SLAPD_F (int) slapd_ack_read LDAP_P((ber_socket_t s, int wake));
 
 LDAP_SLAPD_V (volatile sig_atomic_t) slapd_abrupt_shutdown;
 LDAP_SLAPD_V (volatile sig_atomic_t) slapd_shutdown;