make --address work for a client connecting to a server

[rsync/rsync.git] / rsync.c

diff --git a/rsync.c b/rsync.c
index 680fc0b..a2b432a 100644 (file)
--- a/rsync.c
+++ b/rsync.c
@@ -152,7 +152,6 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
        int updated = 0;
        STRUCT_STAT st2;
        int change_uid, change_gid;
-       extern int am_daemon;
 
        if (dry_run) return 0;
 
@@ -179,7 +178,7 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
        }
 
        change_uid = am_root && preserve_uid && st->st_uid != file->uid;
-       change_gid = !am_daemon && preserve_gid && file->gid != (gid_t) -1 && \
+       change_gid = preserve_gid && file->gid != (gid_t) -1 && \
                                st->st_gid != file->gid;
        if (change_gid && !am_root) {
                /* enforce bsd-style group semantics: non-root can only
@@ -195,6 +194,12 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
                        rprintf(FERROR,"chown %s : %s\n", fname,strerror(errno));
                        return 0;
                }
+               /* a lchown had been done - we have to re-stat if the
+                   destination had the setuid or setgid bits set due
+                   to the side effect of the chown call */
+               if (st->st_mode & (S_ISUID | S_ISGID)) {
+                       link_stat(fname, st);
+               }
                updated = 1;
        }