fixed a small memory leak when using -C

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index b8baa33..955be24 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -118,9 +118,11 @@ static int rsync_module(int fd, int i)
        char *name = lp_name(i);
        char *user;
        int start_glob=0;
+       int ret;
        char *request=NULL;
        extern int am_sender;
        extern int remote_version;
+       extern int am_root;
 
        if (!allow_access(addr, host, lp_hosts_allow(i), lp_hosts_deny(i))) {
                rprintf(FERROR,"rsync denied on module %s from %s (%s)\n",
@@ -131,9 +133,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;
        }
 
@@ -173,7 +182,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);
@@ -204,6 +213,8 @@ static int rsync_module(int fd, int i)
                return -1;
        }
 
+       am_root = (getuid() == 0);
+
        io_printf(fd,"@RSYNCD: OK\n");
 
        argv[argc++] = "rsyncd";
@@ -241,7 +252,7 @@ static int rsync_module(int fd, int i)
                }
        }
 
-       parse_arguments(argc, argv);
+       ret = parse_arguments(argc, argv);
 
        if (request) {
                if (*user) {
@@ -256,8 +267,10 @@ static int rsync_module(int fd, int i)
                free(request);
        }
 
+#if !TRIDGE
        /* don't allow the logs to be flooded too fast */
        if (verbose > 1) verbose = 1;
+#endif
 
        argc -= optind;
        argp = argv + optind;
@@ -266,6 +279,11 @@ static int rsync_module(int fd, int i)
        if (remote_version > 17 && am_sender)
                io_start_multiplex_out(fd);
 
+       if (!ret) {
+               rprintf(FERROR,"Error parsing options (unsupported option?) - aborting\n");
+               exit_cleanup(1);
+       }
+
        start_server(fd, fd, argc, argp);
 
        return 0;
@@ -359,8 +377,24 @@ 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 */
+               int i;
+
+               /* we are running via inetd - close off stdout and
+                  stderr so that library functions (and getopt) don't
+                  try to use them. Redirect them to /dev/null */
+               for (i=1;i<3;i++) {
+                       close(i); 
+                       open("/dev/null", O_RDWR);
+               }
+
+               set_nonblocking(STDIN_FILENO);
+
                return start_daemon(STDIN_FILENO);
        }