Improved a comment.

[rsync/rsync.git] / flist.c

diff --git a/flist.c b/flist.c
index 743df09..c46098f 100644 (file)
--- a/flist.c
+++ b/flist.c
@@ -34,6 +34,7 @@ extern int do_progress;
 extern int am_root;
 extern int am_server;
 extern int am_daemon;
+extern int am_sender;
 extern int always_checksum;
 extern int module_id;
 extern int ignore_errors;
@@ -570,7 +571,7 @@ void receive_file_entry(struct file_struct **fptr, unsigned short flags,
 
        strlcpy(lastname, thisname, MAXPATHLEN);
 
-       clean_fname(thisname);
+       clean_fname(thisname, 0);
 
        if (sanitize_paths)
                sanitize_path(thisname, thisname, "", 0);
@@ -761,7 +762,7 @@ struct file_struct *make_file(char *fname, struct file_list *flist,
                rprintf(FINFO, "skipping overly long name: %s\n", fname);
                return NULL;
        }
-       clean_fname(thisname);
+       clean_fname(thisname, 0);
        if (sanitize_paths)
                sanitize_path(thisname, thisname, "", 0);
 
@@ -1487,7 +1488,7 @@ static void output_flist(struct file_list *flist)
 
        for (i = 0; i < flist->count; i++) {
                file = flist->files[i];
-               if (am_root && preserve_uid)
+               if ((am_root || am_sender) && preserve_uid)
                        sprintf(uidbuf, " uid=%ld", (long)file->uid);
                else
                        *uidbuf = '\0';