ITS#9477 fix regression from #9339

Must provide plain IP address for TCP wrapper

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index 0416b2b23c8a7b8a94f861eafae40a948acd0ea0..4180b81727af68e9abafd24365a29ce3b8fdb0d3 100644 (file)
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -2097,7 +2097,6 @@ slap_listener(
 #endif /* SLAPD_RLOOKUPS */
 
        char    *dnsname = NULL;
-       const char *peeraddr = NULL;
        /* we assume INET6_ADDRSTRLEN > INET_ADDRSTRLEN */
        char peername[LUTIL_ADDRLEN];
        struct berval peerbv = BER_BVC(peername);
@@ -2308,6 +2307,11 @@ slap_listener(
 #ifdef HAVE_TCPD
                {
                        int rc;
+                       char *peeraddr, *paend;
+                       peeraddr = peerbv.bv_val + 3;
+                       paend = strrchr( peeraddr, ':' );
+                       if ( paend )
+                               *paend = '\0';
                        ldap_pvt_thread_mutex_lock( &sd_tcpd_mutex );
                        rc = hosts_ctl("slapd",
                                dnsname != NULL ? dnsname : SLAP_STRING_UNKNOWN,
@@ -2324,6 +2328,8 @@ slap_listener(
                                slapd_close(sfd);
                                return 0;
                        }
+                       if ( paend )
+                               *paend = ':';
                }
 #endif /* HAVE_TCPD */
        }