- close stdout and stderr and reopen then as /dev/null when running as

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 7ce08e6..0723560 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -132,9 +132,16 @@ static int rsync_module(int fd, int i)
        }
 
        if (!claim_connection(lp_lock_file(), lp_max_connections())) {
-               rprintf(FERROR,"max connections (%d) reached\n",
-                       lp_max_connections());
-               io_printf(fd,"@ERROR: max connections (%d) reached - try again later\n", lp_max_connections());
+               if (errno) {
+                       rprintf(FERROR,"failed to open lock file %s : %s\n",
+                               lp_lock_file(), strerror(errno));
+                       io_printf(fd,"@ERROR: failed to open lock file %s : %s\n",
+                                 lp_lock_file(), strerror(errno));
+               } else {
+                       rprintf(FERROR,"max connections (%d) reached\n",
+                               lp_max_connections());
+                       io_printf(fd,"@ERROR: max connections (%d) reached - try again later\n", lp_max_connections());
+               }
                return -1;
        }
 
@@ -174,7 +181,7 @@ static int rsync_module(int fd, int i)
        }
 
        p = lp_exclude_from(i);
-       add_exclude_file(p, 1);
+       add_exclude_file(p, 1, 0);
 
        p = lp_exclude(i);
        add_exclude_line(p);
@@ -362,6 +369,11 @@ int daemon_main(void)
 {
        extern char *config_file;
 
+       /* this ensures that we don't call getcwd after the chroot,
+           which doesn't work on platforms that use popen("pwd","r")
+           for getcwd */
+       push_dir("/", 0);
+
        if (is_a_socket(STDIN_FILENO)) {
                /* we are running via inetd */
                return start_daemon(STDIN_FILENO);