===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rsync/uploader.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -c -r1.19 -r1.20
*** src/usr.bin/rsync/uploader.c	2019/03/23 16:04:28	1.19
--- src/usr.bin/rsync/uploader.c	2019/04/02 11:05:55	1.20
***************
*** 1,4 ****
! /*	$Id: uploader.c,v 1.19 2019/03/23 16:04:28 deraadt Exp $ */
  /*
   * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2019 Florian Obser <florian@openbsd.org>
--- 1,4 ----
! /*	$Id: uploader.c,v 1.20 2019/04/02 11:05:55 deraadt Exp $ */
  /*
   * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2019 Florian Obser <florian@openbsd.org>
***************
*** 624,631 ****
  	 */
  
  	if (u->newdir[idx] ||
! 	    (sess->opts->preserve_perms &&
! 	     st.st_mode != f->st.mode)) {
  		rc = fchmodat(u->rootfd, f->path, f->st.mode, 0);
  		if (rc == -1) {
  			ERR(sess, "%s: fchmodat", f->path);
--- 624,630 ----
  	 */
  
  	if (u->newdir[idx] ||
! 	    (sess->opts->preserve_perms && st.st_mode != f->st.mode)) {
  		rc = fchmodat(u->rootfd, f->path, f->st.mode, 0);
  		if (rc == -1) {
  			ERR(sess, "%s: fchmodat", f->path);
***************
*** 1017,1023 ****
  
  
  	if (!sess->opts->preserve_times &&
! 	     !sess->opts->preserve_perms)
  		return 1;
  
  	LOG2(sess, "fixing up directory times and permissions");
--- 1016,1022 ----
  
  
  	if (!sess->opts->preserve_times &&
! 	    !sess->opts->preserve_perms)
  		return 1;
  
  	LOG2(sess, "fixing up directory times and permissions");