X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Fdaemon.c;h=e9f0a09509eb940469e0c6efd84cb5735fa0d03a;hb=78066c08c0650e5b1e7e205946d409e3dd10e73b;hp=454a1838eb07c20fc868e1706248c1695fe0b382;hpb=17264d1ad48525172232a69c5606a27e33d7747a;p=openldap

diff --git a/servers/slapd/daemon.c b/servers/slapd/daemon.c
index 454a1838eb..e9f0a09509 100644
--- a/servers/slapd/daemon.c
+++ b/servers/slapd/daemon.c
@@ -374,7 +374,7 @@ static int slap_get_listener_addresses(
 		hints.ai_family = AF_UNSPEC;
 		snprintf(serv, sizeof serv, "%d", port);
 
-		if (err = getaddrinfo(host, serv, &hints, &res)) {
+		if ( (err = getaddrinfo(host, serv, &hints, &res)) ) {
 #ifdef NEW_LOGGING
 			LDAP_LOG(( "connection", LDAP_LEVEL_INFO,
 				   "slap_get_listener_addresses: getaddrinfo failed: %s\n",
@@ -396,6 +396,7 @@ static int slap_get_listener_addresses(
 		}
 
 		sap = *sal;
+		*sap = NULL;
 
 		for ( sai=res; sai; sai=sai->ai_next ) {
 			if( sai->ai_addr == NULL ) {
@@ -436,13 +437,14 @@ static int slap_get_listener_addresses(
 				*sap = NULL;
 				break;
 			}
+
 			if (*sap != NULL) {
 				(*sap)->sa_family = sai->ai_family;
 				sap++;
+				*sap = NULL;
 			}
 		}
 
-		*sap = NULL;
 		freeaddrinfo(res);
 #else
 		struct in_addr in;
@@ -500,7 +502,7 @@ static Listener * slap_open_listener(
 	Listener *li;
 	LDAPURLDesc *lud;
 	unsigned short port;
-	int err, addrlen;
+	int err, addrlen = 0;
 	struct sockaddr **sal, **psal;
 	int socktype = SOCK_STREAM;	/* default to COTS */
 
@@ -938,9 +940,12 @@ slapd_daemon_task(
 )
 {
 	int l;
-	time_t	last_idle_check = slap_get_time();
+	time_t	last_idle_check = 0;
 	time( &starttime );
 
+	if ( global_idletimeout > 0 ) {
+		last_idle_check = slap_get_time();
+	}
 	for ( l = 0; slap_listeners[l] != NULL; l++ ) {
 		if ( slap_listeners[l]->sl_sd == AC_SOCKET_INVALID )
 			continue;
@@ -988,12 +993,10 @@ slapd_daemon_task(
 		ber_socket_t nfds;
 #define SLAPD_EBADF_LIMIT 16
 		int ebadf = 0;
-#if defined( EMFILE ) || defined( ENFILE )
 		int emfile = 0;
-#endif
 
 #define SLAPD_IDLE_CHECK_LIMIT 4
-		time_t	now = slap_get_time();
+		time_t	now;
 
 
 		fd_set			readfds;
@@ -1006,15 +1009,15 @@ slapd_daemon_task(
 		struct timeval		zero;
 		struct timeval		*tvp;
 
-		if(
-#if defined( EMFILE ) || defined( ENFILE )
-			emfile ||
-#endif
-			( global_idletimeout > 0 && difftime(
-				last_idle_check+global_idletimeout/SLAPD_IDLE_CHECK_LIMIT,
-				now ) < 0 ))
-		{
-			connections_timeout_idle(now);
+		if( emfile ) {
+			now = slap_get_time();
+			connections_timeout_idle( now );
+		}
+		else if ( global_idletimeout > 0 ) {
+			now = slap_get_time();
+			if ( difftime( last_idle_check+global_idletimeout/SLAPD_IDLE_CHECK_LIMIT, now ) < 0 ) {
+				connections_timeout_idle( now );
+			}
 		}
 
 		FD_ZERO( &writefds );
@@ -1159,7 +1162,7 @@ slapd_daemon_task(
 			slap_ssf_t ssf = 0;
 			char *authid = NULL;
 
-			char	*dnsname;
+			char	*dnsname = NULL;
 			char	*peeraddr;
 #ifdef LDAP_PF_LOCAL
 			char	peername[MAXPATHLEN + sizeof("PATH=")];
@@ -1202,9 +1205,6 @@ slapd_daemon_task(
 			if ( s == AC_SOCKET_INVALID ) {
 				int err = sock_errno();
 
-				ldap_pvt_thread_yield();
-
-#if defined( EMFILE ) || defined( ENFILE )
 #ifdef EMFILE
 				if( err == EMFILE ) {
 					emfile++;
@@ -1213,28 +1213,33 @@ slapd_daemon_task(
 #ifdef ENFILE
 				if( err == ENFILE ) {
 					emfile++;
-				}
-#endif
-				/* prevent busy loop */
-#  ifdef HAVE_USLEEP
-				if( emfile % 4 == 3 ) usleep( 250 );
-#  else
-				if( emfile % 8 == 7 ) sleep( 1 );
-#  endif
-				else continue;
+				} else 
 #endif
+				{
+					emfile=0;
+				}
 
+				if( emfile < 3 ) {
 #ifdef NEW_LOGGING
-				LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
-					"slapd_daemon_task: accept(%ld) failed errno=%d (%s)\n",
-					(long)slap_listeners[l]->sl_sd, err, sock_errstr(err) ));
+					LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
+						"slapd_daemon_task: accept(%ld) failed errno=%d (%s)\n",
+						(long)slap_listeners[l]->sl_sd, err, sock_errstr(err) ));
 #else
-				Debug( LDAP_DEBUG_ANY,
-				    "daemon: accept(%ld) failed errno=%d (%s)\n",
-				    (long) slap_listeners[l]->sl_sd, err,
-				    sock_errstr(err) );
+					Debug( LDAP_DEBUG_ANY,
+					    "daemon: accept(%ld) failed errno=%d (%s)\n",
+					    (long) slap_listeners[l]->sl_sd, err,
+					    sock_errstr(err) );
 #endif
+				} else {
+					/* prevent busy loop */
+#  ifdef HAVE_USLEEP
+					if( emfile % 4 == 3 ) usleep( 250 );
+#  else
+					if( emfile % 8 == 7 ) sleep( 1 );
+#  endif
+				}
 
+				ldap_pvt_thread_yield();
 				continue;
 			}
 			emfile = 0;
@@ -1244,13 +1249,14 @@ slapd_daemon_task(
 			if ( s >= dtblsize ) {
 #ifdef NEW_LOGGING
 				LDAP_LOG(( "connection", LDAP_LEVEL_ERR,
-					   "slapd_daemon_task: %ld beyond descriptor table size %ld\n",
-					   (long)s, (long)dtblsize ));
+				   "slapd_daemon_task: %ld beyond descriptor table size %ld\n",
+				   (long)s, (long)dtblsize ));
 #else
 				Debug( LDAP_DEBUG_ANY,
 					"daemon: %ld beyond descriptor table size %ld\n",
 					(long) s, (long) dtblsize, 0 );
 #endif
+
 				slapd_close(s);
 				ldap_pvt_thread_yield();
 				continue;