Import slapd tcp_wrapper DoS bug fix from -devel.

diff --git a/CHANGES b/CHANGES
index 804baf24e7ffd22b39f9c527e9f4fc4590197528..b4138f01ca8753809e69102de12a1baf3968351d 100644 (file)
--- 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 d14f37eda42a26c3cdd3dfdc9c5ea16deaf991a9..eded4e8f8c78cc8d7b9e67784b1eac7faf5bb2e9 100644 (file)
--- 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 */