X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/61f543cade5926794ed16807d2e83fbe4f03252d..c11b88061f14594ac2d131cc922195c56735d4f3:/socket.c

diff --git a/socket.c b/socket.c
index 010d38e9..84622515 100644
--- a/socket.c
+++ b/socket.c
@@ -30,8 +30,6 @@
 #include "lib/addrinfo.h"
 #endif
 
-// extern int af;			/* NO MORE BLOODY GLOBALS! */
-
 /* Establish a proxy connection on an open socket to a web roxy by
  * using the CONNECT method. */
 static int establish_proxy_connection(int fd, char *host, int port)
@@ -599,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;