From: Kurt Zeilenga Date: Mon, 18 Jan 1999 18:41:15 +0000 (+0000) Subject: Import ITS#44 tcp_wrapper connections bug fix from devel. X-Git-Tag: OPENLDAP_REL_ENG_1_1_3~12 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89d11904e9f6398bcfe621992d71412c0250a17c;p=thirdparty%2Fopenldap.git Import ITS#44 tcp_wrapper connections bug fix from devel. --- diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c index 8cdfb1e52d..b03b80b933 100644 --- a/servers/slapd/daemon.c +++ b/servers/slapd/daemon.c @@ -237,14 +237,9 @@ slapd_daemon( "FIONBIO ioctl on %d failed\n", ns, 0, 0 ); } - c[ns].c_sb.sb_sd = ns; Debug( LDAP_DEBUG_CONNS, "new connection on %d\n", ns, 0, 0 ); - pthread_mutex_lock( &ops_mutex ); - c[ns].c_connid = num_conns++; - pthread_mutex_unlock( &ops_mutex ); - len = sizeof(from); if ( getpeername( ns, (struct sockaddr *) &from, &len ) @@ -284,9 +279,9 @@ slapd_daemon( STRING_UNKNOWN)) { /* DENY ACCESS */ - Statslog( LDAP_DEBUG_STATS, - "conn=%d fd=%d connection from %s (%s) denied.\n", - c[ns].c_connid, ns, + Statslog( LDAP_DEBUG_ANY, + "fd=%d connection from %s (%s) denied.\n", + ns, client_name == NULL ? "unknown" : client_name, client_addr == NULL ? "unknown" : client_addr, 0 ); @@ -297,6 +292,11 @@ slapd_daemon( } #endif /* HAVE_TCPD */ + c[ns].c_sb.sb_sd = ns; + pthread_mutex_lock( &ops_mutex ); + c[ns].c_connid = num_conns++; + pthread_mutex_unlock( &ops_mutex ); + Statslog( LDAP_DEBUG_STATS, "conn=%d fd=%d connection from %s (%s) accepted.\n", c[ns].c_connid, ns,