Merge branch 'master' of ssh://git.samba.org/data/git/samba into wspp-schema

1 files changed, 5 insertions, 41 deletions

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 538e04938e..d27f98281b 100644
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -654,52 +654,16 @@ static void smbd_parent_loop(struct smbd_parent_context *parent)
 {
 	/* now accept incoming connections - forking a new process
 	   for each incoming connection */
-	DEBUG(2,("waiting for a connection\n"));
+	DEBUG(2,("waiting for connections\n"));
 	while (1) {
-		struct timeval now, idle_timeout;
-		fd_set r_fds, w_fds;
-		int maxfd = 0;
-		int num;
+		int ret;
 		TALLOC_CTX *frame = talloc_stackframe();
 
-		if (run_events(smbd_event_context(), 0, NULL, NULL)) {
-			TALLOC_FREE(frame);
-			continue;
-		}
-
-		idle_timeout = timeval_zero();
-
-		FD_ZERO(&w_fds);
-		FD_ZERO(&r_fds);
-		GetTimeOfDay(&now);
-
-		event_add_to_select_args(smbd_event_context(), &now,
-					 &r_fds, &w_fds, &idle_timeout,
-					 &maxfd);
-
-		num = sys_select(maxfd+1,&r_fds,&w_fds,NULL,
-				 timeval_is_zero(&idle_timeout) ?
-				 NULL : &idle_timeout);
-
-		/* check if we need to reload services */
-		check_reload(time(NULL));
-
-		if (run_events(smbd_event_context(), num, &r_fds, &w_fds)) {
-			TALLOC_FREE(frame);
-			continue;
+		ret = tevent_loop_once(smbd_event_context());
+		if (ret != 0) {
+			exit_server_cleanly("tevent_loop_once() error");
 		}
 
-		/* socket error */
-		if (num < 0)
-			exit_server_cleanly("socket error");
-
-		/* If the idle timeout fired and we don't have any connected
-		 * users, exit gracefully. We should be running under a process
-		 * controller that will restart us if necessry.
-		 */
-		if (num == 0 && count_all_current_connections() == 0) {
-			exit_server_cleanly("idle timeout");
-		}
 		TALLOC_FREE(frame);
 	} /* end while 1 */