X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/a57568d7167cb54b9b0802aeabf5a424749fbd65..1336e4146079b92460fcfd67cbec5ed8ad7bdafa:/socket.c

diff --git a/socket.c b/socket.c
index b97e2378..84622515 100644
--- a/socket.c
+++ b/socket.c
@@ -597,12 +597,12 @@ char *client_name(int fd)
 	if (getpeername(fd, (struct sockaddr *)&ss, &length)) {
 		/* FIXME: Can we really not continue? */
 		rprintf(FERROR, RSYNC_NAME ": getpeername on fd%d failed: %s\n",
-			strerror(errno));			
+			fd, strerror(errno));
 		exit_cleanup(RERR_SOCKETIO);
 	}
 
 #ifdef INET6
-        if (ss.ss_family == AF_INET6 && 
+        if (ss.sa_family == AF_INET6 && 
 	    IN6_IS_ADDR_V4MAPPED(&((struct sockaddr_in6 *)&ss)->sin6_addr)) {
 		struct sockaddr_in6 sin6;
 		struct sockaddr_in *sin;