===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rsync/server.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -c -r1.2 -r1.3
*** src/usr.bin/rsync/server.c	2019/02/10 23:24:14	1.2
--- src/usr.bin/rsync/server.c	2019/02/11 19:18:36	1.3
***************
*** 1,4 ****
! /*	$Id: server.c,v 1.2 2019/02/10 23:24:14 benno Exp $ */
  /*
   * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
   *
--- 1,4 ----
! /*	$Id: server.c,v 1.3 2019/02/11 19:18:36 deraadt Exp $ */
  /*
   * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
   *
***************
*** 62,69 ****
  
  	/* Begin by making descriptors non-blocking. */
  
! 	if ( ! fcntl_nonblock(&sess, fdin) ||
! 	     ! fcntl_nonblock(&sess, fdout)) {
  		ERRX1(&sess, "fcntl_nonblock");
  		goto out;
  	}
--- 62,69 ----
  
  	/* Begin by making descriptors non-blocking. */
  
! 	if (!fcntl_nonblock(&sess, fdin) ||
! 	     !fcntl_nonblock(&sess, fdout)) {
  		ERRX1(&sess, "fcntl_nonblock");
  		goto out;
  	}
***************
*** 73,85 ****
  	sess.lver = RSYNC_PROTOCOL;
  	sess.seed = arc4random();
  
! 	if ( ! io_read_int(&sess, fdin, &sess.rver)) {
  		ERRX1(&sess, "io_read_int");
  		goto out;
! 	} else if ( ! io_write_int(&sess, fdout, sess.lver)) {
  		ERRX1(&sess, "io_write_int");
  		goto out;
! 	} else if ( ! io_write_int(&sess, fdout, sess.seed)) {
  		ERRX1(&sess, "io_write_int");
  		goto out;
  	}
--- 73,85 ----
  	sess.lver = RSYNC_PROTOCOL;
  	sess.seed = arc4random();
  
! 	if (!io_read_int(&sess, fdin, &sess.rver)) {
  		ERRX1(&sess, "io_read_int");
  		goto out;
! 	} else if (!io_write_int(&sess, fdout, sess.lver)) {
  		ERRX1(&sess, "io_write_int");
  		goto out;
! 	} else if (!io_write_int(&sess, fdout, sess.seed)) {
  		ERRX1(&sess, "io_write_int");
  		goto out;
  	}
***************
*** 121,127 ****
  			goto out;
  		}
  
! 		if ( ! rsync_sender(&sess, fdin, fdout, argc, argv)) {
  			ERRX1(&sess, "rsync_sender");
  			goto out;
  		}
--- 121,127 ----
  			goto out;
  		}
  
! 		if (!rsync_sender(&sess, fdin, fdout, argc, argv)) {
  			ERRX1(&sess, "rsync_sender");
  			goto out;
  		}
***************
*** 144,150 ****
  			goto out;
  		}
  
! 		if ( ! rsync_receiver(&sess, fdin, fdout, argv[1])) {
  			ERRX1(&sess, "rsync_receiver");
  			goto out;
  		}
--- 144,150 ----
  			goto out;
  		}
  
! 		if (!rsync_receiver(&sess, fdin, fdout, argv[1])) {
  			ERRX1(&sess, "rsync_receiver");
  			goto out;
  		}