From: Kurt Zeilenga <kurt@openldap.org>
Date: Thu, 7 Jan 1999 18:24:25 +0000 (+0000)
Subject: Import slapd tcp_wrapper DoS bug fix from -devel.
X-Git-Tag: OPENLDAP_REL_ENG_1_1_3~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2b62024753180017a640443d8f993269156543dd;p=thirdparty%2Fopenldap.git

Import slapd tcp_wrapper DoS bug fix from -devel.
---

diff --git a/CHANGES b/CHANGES
index 804baf24e7..b4138f01ca 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,8 +2,9 @@ OpenLDAP Change Log
 
 Changes included in OpenLDAP 1.1.x
 	CVS Tag: OPENLDAP_REL_ENG_1_1
-	Fixed slapd/strtok needs mutex bug
 	Fixed slapd/ldbm/delete initialization bug (ITS#31)
+	Fixed slapd/strtok needs mutex bug
+	Fixed salpd/tcpd DoS bug
 	Build environment
 		Fixed doc/man reinstall bug
 
diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index d14f37eda4..eded4e8f8c 100644
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -277,7 +277,9 @@ slapd_daemon(
 			}
 
 #ifdef HAVE_TCPD
-			if(!hosts_ctl("slapd", client_name, client_addr,
+			if(!hosts_ctl("slapd",
+				client_name != NULL ? client_name : STRING_UNKNOWN,
+				client_addr != NULL ? client_addr : STRING_UNKNOWN,
 				STRING_UNKNOWN))
 			{
 				/* DENY ACCESS */