Some improvements for --hard-links and --filter options.

[rsync/rsync.git] / clientserver.c

diff --git a/clientserver.c b/clientserver.c
index 9207b1a..71cb979 100644 (file)
--- a/clientserver.c
+++ b/clientserver.c
@@ -58,6 +58,7 @@ extern char curr_dir[];
 char *auth_user;
 int read_only = 0;
 int module_id = -1;
+int munge_symlinks = 0;
 struct chmod_mode_struct *daemon_chmod_modes;
 
 /* module_dirlen is the length of the module_dir string when in daemon
@@ -244,7 +245,7 @@ int start_inband_exchange(int f_in, int f_out, const char *user, int argc, char
                        rprintf(FERROR, "internal: args[] overflowed in do_cmd()\n");
                        exit_cleanup(RERR_SYNTAX);
                }
-               if (list_only && strncmp(*argv, modname, modlen) == 0
+               if (strncmp(*argv, modname, modlen) == 0
                 && argv[0][modlen] == '\0')
                        sargs[sargc++] = modname; /* we send "modname/" */
                else
@@ -354,8 +355,12 @@ static int read_arg_from_pipe(int fd, char *buf, int limit)
        char *bp = buf, *eob = buf + limit - 1;
 
        while (1) {
-           if (read(fd, bp, 1) != 1)
+           int got = read(fd, bp, 1);
+           if (got != 1) {
+               if (got < 0 && errno == EINTR)
+                       continue;
                return -1;
+           }
            if (*bp == '\0')
                break;
            if (bp < eob)
@@ -624,6 +629,18 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
                sanitize_paths = 1;
        }
 
+       if ((munge_symlinks = lp_munge_symlinks(i)) < 0)
+               munge_symlinks = !use_chroot;
+       if (munge_symlinks) {
+               STRUCT_STAT st;
+               if (stat(SYMLINK_PREFIX, &st) == 0 && S_ISDIR(st.st_mode)) {
+                       rprintf(FLOG, "Symlink munging is unsupported when a %s directory exists.\n",
+                               SYMLINK_PREFIX);
+                       io_printf(f_out, "@ERROR: daemon security issue -- contact admin\n", name);
+                       exit_cleanup(RERR_UNSUPPORTED);
+               }
+       }
+
        if (am_root) {
                /* XXXX: You could argue that if the daemon is started
                 * by a non-root user and they explicitly specify a
@@ -686,6 +703,10 @@ static int rsync_module(int f_in, int f_out, int i, char *addr, char *host)
        if (write_batch < 0)
                dry_run = 1;
 
+#ifdef ICONV_CONST
+       setup_iconv();
+#endif
+
        if (lp_fake_super(i))
                am_root = -1;
        else if (am_root < 0) /* Treat --fake-super from client as --super. */