- Call safe_stat() instead of do_stat() when a sanitizing daemon might

  need to ensure that it doesn't follow any unsafe symlinks.
- Don't sanitize the string of a symlink -- just use it verbatim.

diff --git a/generator.c b/generator.c
index 1860b0d..0bb4e9f 100644 (file)
--- a/generator.c
+++ b/generator.c
@@ -50,8 +50,6 @@ extern int delete_before;
 extern int delete_during;
 extern int delete_after;
 extern int module_id;
-extern int sanitize_paths;
-extern int startdir_depth;
 extern int ignore_errors;
 extern int remove_sent_files;
 extern int delay_updates;
@@ -859,7 +857,7 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                char *dn = file->dirname ? file->dirname : ".";
                if (parent_dirname != dn && strcmp(parent_dirname, dn) != 0) {
                        if (relative_paths && !implied_dirs
-                        && do_stat(dn, &st) < 0
+                        && safe_stat(dn, &st) < 0
                         && create_directory_path(fname) < 0) {
                                rsyserr(FERROR, errno,
                                        "recv_generator: mkdir %s failed",
@@ -955,10 +953,6 @@ static void recv_generator(char *fname, struct file_struct *file, int ndx,
                        }
                        return;
                }
-               if (sanitize_paths) {
-                       sanitize_path(file->u.link, file->u.link, "",
-                                     startdir_depth + file->dir.depth - 1);
-               }
                if (statret == 0) {
                        char lnk[MAXPATHLEN];
                        int len;