added a --partial option which tells rsync to keep partially

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index b8baa33..92d9b2c 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -121,6 +121,7 @@ static int rsync_module(int fd, int i)
        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",
@@ -173,7 +174,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 +205,8 @@ static int rsync_module(int fd, int i)
                return -1;
        }
 
+       am_root = (getuid() == 0);
+
        io_printf(fd,"@RSYNCD: OK\n");
 
        argv[argc++] = "rsyncd";
@@ -359,6 +362,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);