If the do_lchown() fails and we weren't trying to change the user,

the error now says that chgrp failed, not chown.

diff --git a/rsync.c b/rsync.c
index 9bd7e42..670f48b 100644 (file)
--- a/rsync.c
+++ b/rsync.c
@@ -160,7 +160,8 @@ int set_perms(char *fname,struct file_struct *file,STRUCT_STAT *st,
                              change_gid?file->gid:st->st_gid) != 0) {
                        /* shouldn't have attempted to change uid or gid
                             unless have the privilege */
                              change_gid?file->gid:st->st_gid) != 0) {
                        /* shouldn't have attempted to change uid or gid
                             unless have the privilege */

-                       rprintf(FERROR, "chown %s failed: %s\n",
+                       rprintf(FERROR, "%s %s failed: %s\n",
+                               change_uid ? "chown" : "chgrp",

                                full_fname(fname), strerror(errno));
                        return 0;
                }
                                full_fname(fname), strerror(errno));
                        return 0;
                }