diff --git a/CHANGES b/CHANGES
index a8abd1d7e6215843c4c444c9ee99dfae1f876b75..ff1df0ead745e4f6b6ba261215403abee95606c2 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,7 @@ OpenLDAP 2.4.24 Engineering
 	Added slapd-sql autocommit support (ITS#6612)
 	Fixed liblber to not close invalid sockets (ITS#6585)
 	Fixed libldap dnssrv port format specifier (ITS#6644)
+	Fixed libldap EOF handling (ITS#6723)
 	Fixed libldap GnuTLS hang on socket close (ITS#6673)
 	Fixed libldap sasl partial write handling (ITS#6639)
 	Fixed libldap referral chasing (ITS#6602)
@@ -34,6 +35,9 @@ OpenLDAP 2.4.24 Engineering
 	Fixed contrib/autogroup LDAP URI with attribute filter (ITS#6536)
 	Fixed contrib/nssov to only close socket on shutdown (ITS#6676)
 	Fixed contrib/nssov multi platform support (ITS#6604)
+	Build Environment
+		Fixed slapd-tester EOF handling (ITS#6723)
+		Fixed slapd-tesster filter initialization (ITS#6735)
 	Documentation
 		admin24 guide typo fixes (ITS#6609)
 		ldap_open(3) document ldap_set_urllist_proc (ITS#6601)
diff --git a/libraries/libldap/dntest.c b/libraries/libldap/dntest.c
index 0ee80283b09e97ee8219e705ac14232563089abe..82e97cc6084e971cb580dfe2e6dd9c148771fa61 100644
--- a/libraries/libldap/dntest.c
+++ b/libraries/libldap/dntest.c
@@ -81,11 +81,9 @@ main( int argc, char *argv[] )
 	}
 
 	if ( strcmp( argv[ 1 ], "-" ) == 0 ) {
-		size_t len;
-		
-		fgets( buf, sizeof( buf ), stdin );
-		len = strlen( buf );
-		if ( len > 0 && buf[ --len ] == '\n' ) {
+		size_t len = fgets( buf, sizeof( buf ), stdin ) ? strlen( buf ) : 0;
+
+		if ( len == 0 || buf[ --len ] == '\n' ) {
 			buf[ len ] = '\0';
 		}
 		strin = buf;
@@ -296,4 +294,3 @@ main( int argc, char *argv[] )
 
 	return( 0 );
 }
-