[PATCH] Fix assertion failure when merging common ancestors.

[git.git] / daemon.c

diff --git a/daemon.c b/daemon.c
index 932d908..5100cf2 100644 (file)
--- a/daemon.c
+++ b/daemon.c
@@ -3,6 +3,7 @@
 #include <signal.h>
 #include <sys/wait.h>
 #include <sys/socket.h>
+#include <sys/time.h>
 #include <netdb.h>
 #include <netinet/in.h>
 
@@ -79,11 +80,11 @@ static unsigned int children_deleted = 0;
 
 static struct child {
        pid_t pid;
-       socklen_t addrlen;
+       int addrlen;
        struct sockaddr_storage address;
 } live_child[MAX_CHILDREN];
 
-static void add_child(int idx, pid_t pid, struct sockaddr *addr, socklen_t addrlen)
+static void add_child(int idx, pid_t pid, struct sockaddr *addr, int addrlen)
 {
        live_child[idx].pid = pid;
        live_child[idx].addrlen = addrlen;
@@ -177,7 +178,7 @@ static void check_max_connections(void)
        }
 }
 
-static void handle(int incoming, struct sockaddr *addr, socklen_t addrlen)
+static void handle(int incoming, struct sockaddr *addr, int addrlen)
 {
        pid_t pid = fork();
 
@@ -307,7 +308,7 @@ static int serve(int port)
 
                        if (FD_ISSET(sockfd, &fds)) {
                                struct sockaddr_storage ss;
-                               socklen_t sslen = sizeof(ss);
+                               int sslen = sizeof(ss);
                                int incoming = accept(sockfd, (struct sockaddr *)&ss, &sslen);
                                if (incoming < 0) {
                                        switch (errno) {
@@ -352,8 +353,10 @@ int main(int argc, char **argv)
                usage(daemon_usage);
        }
 
-       if (inetd_mode)
+       if (inetd_mode) {
+               fclose(stderr); //FIXME: workaround
                return execute();
+       }
 
        return serve(port);
 }