===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/rsync/socket.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -c -r1.6 -r1.7
*** src/usr.bin/rsync/socket.c	2019/02/12 19:20:15	1.6
--- src/usr.bin/rsync/socket.c	2019/02/16 05:06:30	1.7
***************
*** 1,4 ****
! /*	$Id: socket.c,v 1.6 2019/02/12 19:20:15 benno Exp $ */
  /*
   * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
   *
--- 1,4 ----
! /*	$Id: socket.c,v 1.7 2019/02/16 05:06:30 deraadt Exp $ */
  /*
   * Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
   *
***************
*** 71,83 ****
  	 * while waiting for this to finish.
  	 */
  
! 	c = connect(*sd,
! 		(const struct sockaddr *)&src->sa,
! 		src->salen);
  	if (c == -1) {
  		if (errno == ECONNREFUSED || errno == EHOSTUNREACH) {
! 			WARNX(sess, "connect refused: "
! 				"%s, %s", src->ip, host);
  			return 0;
  		}
  		ERR(sess, "connect");
--- 71,81 ----
  	 * while waiting for this to finish.
  	 */
  
! 	c = connect(*sd, (const struct sockaddr *)&src->sa, src->salen);
  	if (c == -1) {
  		if (errno == ECONNREFUSED || errno == EHOSTUNREACH) {
! 			WARNX(sess, "connect refused: %s, %s",
! 			    src->ip, host);
  			return 0;
  		}
  		ERR(sess, "connect");
***************
*** 124,134 ****
  
  	if (error == EAI_AGAIN || error == EAI_NONAME) {
  		ERRX(sess, "DNS resolve error: %s: %s",
! 			host, gai_strerror(error));
  		return NULL;
  	} else if (error) {
  		ERRX(sess, "DNS parse error: %s: %s",
! 			host, gai_strerror(error));
  		return NULL;
  	}
  
--- 122,132 ----
  
  	if (error == EAI_AGAIN || error == EAI_NONAME) {
  		ERRX(sess, "DNS resolve error: %s: %s",
! 		    host, gai_strerror(error));
  		return NULL;
  	} else if (error) {
  		ERRX(sess, "DNS parse error: %s: %s",
! 		    host, gai_strerror(error));
  		return NULL;
  	}
  
***************
*** 170,182 ****
  		if (res->ai_family == AF_INET) {
  			src[i].family = PF_INET;
  			inet_ntop(AF_INET,
! 				&(((struct sockaddr_in *)sa)->sin_addr),
! 				src[i].ip, INET6_ADDRSTRLEN);
  		} else {
  			src[i].family = PF_INET6;
  			inet_ntop(AF_INET6,
! 				&(((struct sockaddr_in6 *)sa)->sin6_addr),
! 				src[i].ip, INET6_ADDRSTRLEN);
  		}
  
  		LOG2(sess, "DNS resolved: %s: %s", host, src[i].ip);
--- 168,180 ----
  		if (res->ai_family == AF_INET) {
  			src[i].family = PF_INET;
  			inet_ntop(AF_INET,
! 			    &(((struct sockaddr_in *)sa)->sin_addr),
! 			    src[i].ip, INET6_ADDRSTRLEN);
  		} else {
  			src[i].family = PF_INET6;
  			inet_ntop(AF_INET6,
! 			    &(((struct sockaddr_in6 *)sa)->sin6_addr),
! 			    src[i].ip, INET6_ADDRSTRLEN);
  		}
  
  		LOG2(sess, "DNS resolved: %s: %s", host, src[i].ip);