===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rsync/flist.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -c -r1.10 -r1.11
*** src/usr.bin/rsync/flist.c	2019/02/12 19:19:13	1.10
--- src/usr.bin/rsync/flist.c	2019/02/12 19:33:59	1.11
***************
*** 1,4 ****
! /*	$Id: flist.c,v 1.10 2019/02/12 19:19:13 benno Exp $ */
  /*
   * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
   *
--- 1,4 ----
! /*	$Id: flist.c,v 1.11 2019/02/12 19:33:59 benno Exp $ */
  /*
   * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
   *
***************
*** 610,622 ****
  		/* Conditional part: gid. */
  
  		if (sess->opts->preserve_gids) {
! 			if ( ! (FLIST_GID_SAME & flag)) {
! 				if ( ! io_read_int(sess, fd, &ival)) {
  					ERRX1(sess, "io_read_int");
  					goto out;
  				}
  				ff->st.gid = ival;
! 			} else if (NULL == fflast) {
  				ERRX(sess, "same gid "
  					"without last entry");
  				goto out;
--- 610,622 ----
  		/* Conditional part: gid. */
  
  		if (sess->opts->preserve_gids) {
! 			if (!(FLIST_GID_SAME & flag)) {
! 				if (!io_read_int(sess, fd, &ival)) {
  					ERRX1(sess, "io_read_int");
  					goto out;
  				}
  				ff->st.gid = ival;
! 			} else if (fflast == NULL) {
  				ERRX(sess, "same gid "
  					"without last entry");
  				goto out;