Make sure the log file is always opened before root privileges (if any)

[rsync/rsync.git] / socket.c

diff --git a/socket.c b/socket.c
index 9c86c49..b4d078c 100644 (file)
--- a/socket.c
+++ b/socket.c
@@ -89,10 +89,11 @@ static int establish_proxy_connection(int fd, char *host, int port)
 /* open a socket to a tcp remote host with the specified port 
    based on code from Warren
    proxy support by Stephen Rothwell */
-int open_socket_out(char *host, int port)
+int open_socket_out(char *host, int port, struct in_addr *address)
 {
        int type = SOCK_STREAM;
        struct sockaddr_in sock_out;
+       struct sockaddr_in sock;
        int res;
        struct hostent *hp;
        char *h;
@@ -137,6 +138,13 @@ int open_socket_out(char *host, int port)
        sock_out.sin_port = htons(p);
        sock_out.sin_family = PF_INET;
 
+       if (address) {
+               sock.sin_addr = *address;
+               sock.sin_port = 0;
+               sock.sin_family = hp->h_addrtype;
+               bind(res, (struct sockaddr * ) &sock,sizeof(sock));
+       }
+
        if (connect(res,(struct sockaddr *)&sock_out,sizeof(sock_out))) {
                rprintf(FERROR,"failed to connect to %s - %s\n", h, strerror(errno));
                close(res);
@@ -239,6 +247,11 @@ void start_accept_loop(int port, int (*fn)(int ))
                struct sockaddr addr;
                int in_addrlen = sizeof(addr);
 
+               /* close log file before the potentially very long select so
+                  file can be trimmed by another process instead of growing
+                  forever */
+               log_close();
+
                FD_ZERO(&fds);
                FD_SET(s, &fds);
 
@@ -264,6 +277,10 @@ void start_accept_loop(int port, int (*fn)(int ))
                if (fork()==0) {
                        close(s);
 
+                       /* open log file in child before possibly giving
+                          up privileges  */
+                       log_open();
+
                        _exit(fn(fd));
                }