Remove a misleading comment

[ira/wip.git] / source3 / winbindd / winbindd.c

diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index d090b6f994afd5c2dbba20d9c73cce370ef3f604..1cd16b20ba1b3fa7f100506d4d4226ce91442a2d 100644 (file)
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -927,6 +927,95 @@ static bool remove_idle_client(void)
        return False;
 }
 
+struct winbindd_listen_state {
+       bool privileged;
+       int fd;
+       struct tevent_fd *fde;
+};
+
+static void winbindd_listen_fde_handler(struct tevent_context *ev,
+                                       struct tevent_fd *fde,
+                                       uint16_t flags,
+                                       void *private_data)
+{
+       struct winbindd_listen_state *s = talloc_get_type_abort(private_data,
+                                         struct winbindd_listen_state);
+
+       while (winbindd_num_clients() >
+              WINBINDD_MAX_SIMULTANEOUS_CLIENTS - 1) {
+               DEBUG(5,("winbindd: Exceeding %d client "
+                        "connections, removing idle "
+                        "connection.\n",
+                        WINBINDD_MAX_SIMULTANEOUS_CLIENTS));
+               if (!remove_idle_client()) {
+                       DEBUG(0,("winbindd: Exceeding %d "
+                                "client connections, no idle "
+                                "connection found\n",
+                                WINBINDD_MAX_SIMULTANEOUS_CLIENTS));
+                       break;
+               }
+       }
+       new_connection(s->fd, s->privileged);
+}
+
+static bool winbindd_setup_listeners(void)
+{
+       struct winbindd_listen_state *pub_state = NULL;
+       struct winbindd_listen_state *priv_state = NULL;
+
+       pub_state = talloc(winbind_event_context(),
+                          struct winbindd_listen_state);
+       if (!pub_state) {
+               goto failed;
+       }
+
+       pub_state->privileged = false;
+       pub_state->fd = open_winbindd_socket();
+       if (pub_state->fd == -1) {
+               goto failed;
+       }
+
+       pub_state->fde = tevent_add_fd(winbind_event_context(),
+                                      pub_state, pub_state->fd,
+                                      TEVENT_FD_READ,
+                                      winbindd_listen_fde_handler,
+                                      pub_state);
+       if (!pub_state->fde) {
+               close(pub_state->fd);
+               goto failed;
+       }
+       tevent_fd_set_auto_close(pub_state->fde);
+
+       priv_state = talloc(winbind_event_context(),
+                           struct winbindd_listen_state);
+       if (!priv_state) {
+               goto failed;
+       }
+
+       priv_state->privileged = true;
+       priv_state->fd = open_winbindd_priv_socket();
+       if (priv_state->fd == -1) {
+               goto failed;
+       }
+
+       priv_state->fde = tevent_add_fd(winbind_event_context(),
+                                       priv_state, priv_state->fd,
+                                       TEVENT_FD_READ,
+                                       winbindd_listen_fde_handler,
+                                       priv_state);
+       if (!priv_state->fde) {
+               close(priv_state->fd);
+               goto failed;
+       }
+       tevent_fd_set_auto_close(priv_state->fde);
+
+       return true;
+failed:
+       TALLOC_FREE(pub_state);
+       TALLOC_FREE(priv_state);
+       return false;
+}
+
 /* Process incoming clients on listen_sock.  We use a tricky non-blocking,
    non-forking, non-threaded model which allows us to handle many
    simultaneous connections while remaining impervious to many denial of
@@ -936,28 +1025,15 @@ static void process_loop(void)
 {
        struct winbindd_fd_event *ev;
        fd_set r_fds, w_fds;
-       int maxfd, listen_sock, listen_priv_sock, selret;
+       int maxfd = 0, selret;
        struct timeval timeout, ev_timeout;
 
-       /* Open Sockets here to get stuff going ASAP */
-       listen_sock = open_winbindd_socket();
-       listen_priv_sock = open_winbindd_priv_socket();
-
-       if (listen_sock == -1 || listen_priv_sock == -1) {
-               perror("open_winbind_socket");
-               exit(1);
-       }
-
        run_events(winbind_event_context(), 0, NULL, NULL);
 
        /* Initialise fd lists for select() */
 
-       maxfd = MAX(listen_sock, listen_priv_sock);
-
        FD_ZERO(&r_fds);
        FD_ZERO(&w_fds);
-       FD_SET(listen_sock, &r_fds);
-       FD_SET(listen_priv_sock, &r_fds);
 
        timeout.tv_sec = WINBINDD_ESTABLISH_LOOP;
        timeout.tv_usec = 0;
@@ -1021,43 +1097,7 @@ static void process_loop(void)
                ev = next;
        }
 
-       if (FD_ISSET(listen_sock, &r_fds)) {
-               while (winbindd_num_clients() >
-                      WINBINDD_MAX_SIMULTANEOUS_CLIENTS - 1) {
-                       DEBUG(5,("winbindd: Exceeding %d client "
-                                "connections, removing idle "
-                                "connection.\n",
-                                WINBINDD_MAX_SIMULTANEOUS_CLIENTS));
-                       if (!remove_idle_client()) {
-                               DEBUG(0,("winbindd: Exceeding %d "
-                                        "client connections, no idle "
-                                        "connection found\n",
-                                        WINBINDD_MAX_SIMULTANEOUS_CLIENTS));
-                               break;
-                       }
-               }
-               /* new, non-privileged connection */
-               new_connection(listen_sock, False);
-       }
-
-       if (FD_ISSET(listen_priv_sock, &r_fds)) {
-               while (winbindd_num_clients() >
-                      WINBINDD_MAX_SIMULTANEOUS_CLIENTS - 1) {
-                       DEBUG(5,("winbindd: Exceeding %d client "
-                                "connections, removing idle "
-                                "connection.\n",
-                                WINBINDD_MAX_SIMULTANEOUS_CLIENTS));
-                       if (!remove_idle_client()) {
-                               DEBUG(0,("winbindd: Exceeding %d "
-                                        "client connections, no idle "
-                                        "connection found\n",
-                                        WINBINDD_MAX_SIMULTANEOUS_CLIENTS));
-                               break;
-                       }
-               }
-               /* new, privileged connection */
-               new_connection(listen_priv_sock, True);
-       }
+       return;
 
  no_fds_ready:
 
@@ -1344,9 +1384,15 @@ int main(int argc, char **argv, char **envp)
        smb_nscd_flush_user_cache();
        smb_nscd_flush_group_cache();
 
-       /* Loop waiting for requests */
+       /* setup listen sockets */
+
+       if (!winbindd_setup_listeners()) {
+               DEBUG(0,("winbindd_setup_listeners() failed\n"));
+               exit(1);
+       }
 
        TALLOC_FREE(frame);
+       /* Loop waiting for requests */
        while (1) {
                struct winbindd_cli_state *state;