===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rsync/receiver.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- src/usr.bin/rsync/receiver.c	2019/02/14 18:29:08	1.7
+++ src/usr.bin/rsync/receiver.c	2019/02/14 18:30:11	1.8
@@ -1,4 +1,4 @@
-/*	$Id: receiver.c,v 1.7 2019/02/14 18:29:08 florian Exp $ */
+/*	$Id: receiver.c,v 1.8 2019/02/14 18:30:11 florian Exp $ */
 
 /*
  * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
@@ -44,8 +44,8 @@
 rsync_set_metadata(struct sess *sess, int newfile,
 	int fd, const struct flist *f, const char *path)
 {
-	uid_t		 uid;
-	gid_t		 gid;
+	uid_t		 uid = (uid_t)-1;
+	gid_t		 gid = (gid_t)-1;
 	struct timespec	 tv[2];
 
 	/*
@@ -55,10 +55,12 @@
 	 * group identifier.
 	 */
 
-	if (sess->opts->preserve_gids ||
-	    sess->opts->preserve_uids) {
-		uid = sess->opts->preserve_uids ? f->st.uid : -1;
-		gid = sess->opts->preserve_gids ? f->st.gid : -1;
+	if (getuid() == 0 && sess->opts->preserve_uids)
+		uid = f->st.uid;
+	if (sess->opts->preserve_gids)
+		gid = f->st.gid;
+
+	if (uid != (uid_t)-1 || gid != (gid_t)-1) {
 		if (fchown(fd, uid, gid) == -1) {
 			if (errno != EPERM) {
 				ERR(sess, "%s: fchown", path);