X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/1e736b8ff75180a01ad26ee92696d5dde4fe2628..e0ed4e4087ebeff0b0fe8f3419bcccf84fbd89a9:/clientname.c

diff --git a/clientname.c b/clientname.c
index 93ca68e1..661d4ab6 100644
--- a/clientname.c
+++ b/clientname.c
@@ -34,6 +34,8 @@
 #include "rsync.h"
 
 static const char default_name[] = "UNKNOWN";
+extern int am_daemon;
+extern int am_server;
 
 
 /**
@@ -44,6 +46,7 @@ char *client_addr(int fd)
 	struct sockaddr_storage ss;
 	socklen_t length = sizeof ss;
 	char *ssh_client, *p;
+	int len;
 	static char addr_buf[100];
 	static int initialised;
 
@@ -51,19 +54,24 @@ char *client_addr(int fd)
 
 	initialised = 1;
 
-	if ((ssh_client = getenv("SSH_CLIENT")) != NULL) {
-		strlcpy(addr_buf, ssh_client, sizeof(addr_buf));
-		/* truncate SSH_CLIENT to just IP address */
-		p = strchr(addr_buf, ' ');
-		if (p)
-			*p = '\0';
-		else
-			strlcpy(addr_buf, "0.0.0.0", sizeof("0.0.0.0"));
-	} else
+	if (am_server) {
+		/* daemon over --rsh mode */
+		strcpy(addr_buf, "0.0.0.0");
+		if ((ssh_client = getenv("SSH_CLIENT")) != NULL) {
+			/* truncate SSH_CLIENT to just IP address */
+			p = strchr(ssh_client, ' ');
+			if (p) {
+				len = MIN((unsigned int) (p - ssh_client), 
+						sizeof(addr_buf) - 1);
+				strncpy(addr_buf, ssh_client, len);
+				*(addr_buf + len) = '\0';
+			}
+		}
+	} else {
 		client_sockaddr(fd, &ss, &length);
-
-	getnameinfo((struct sockaddr *)&ss, length,
-		addr_buf, sizeof(addr_buf), NULL, 0, NI_NUMERICHOST);
+		getnameinfo((struct sockaddr *)&ss, length,
+			    addr_buf, sizeof addr_buf, NULL, 0, NI_NUMERICHOST);
+	}
 
 	return addr_buf;
 }
@@ -93,7 +101,11 @@ char *client_name(int fd)
 	static char name_buf[100];
 	static char port_buf[100];
 	static int initialised;
-	struct sockaddr_storage *ssp;
+	struct sockaddr_storage ss, *ssp;
+	struct sockaddr_in sin;
+#ifdef INET6
+	struct sockaddr_in6 sin6;
+#endif
 	socklen_t ss_len;
 
 	if (initialised) return name_buf;
@@ -101,16 +113,15 @@ char *client_name(int fd)
 	strcpy(name_buf, default_name);
 	initialised = 1;
 
-	if (getenv("SSH_CLIENT") != NULL) {
-		/* Look up name of IP address given in $SSH_CLIENT */
+	if (am_server) {
+		/* daemon over --rsh mode */
+
 		char *addr = client_addr(fd);
-		struct sockaddr_in sin;
 #ifdef INET6
 		int dots = 0;
 		char *p;
-		struct sockaddr_in6 sin6;
 
-		for (p = addr; *p && (dots < 3); p++) {
+		for (p = addr; *p && (dots <= 3); p++) {
 		    if (*p == '.')
 			dots++;
 		}
@@ -119,7 +130,7 @@ char *client_name(int fd)
 			ssp = (struct sockaddr_storage *) &sin6;
 			ss_len = sizeof sin6;
 			memset(ssp, 0, ss_len);
-			inet_pton(AF_INET6, addr, &sin6.sin6_addr.s6_addr);
+			inet_pton(AF_INET6, addr, &sin6.sin6_addr);
 			sin6.sin6_family = AF_INET6;
 		} else
 #endif
@@ -127,13 +138,11 @@ char *client_name(int fd)
 			ssp = (struct sockaddr_storage *) &sin;
 			ss_len = sizeof sin;
 			memset(ssp, 0, ss_len);
-			inet_pton(AF_INET, addr, &sin.sin_addr.s_addr);
+			inet_pton(AF_INET, addr, &sin.sin_addr);
 			sin.sin_family = AF_INET;
 		}
 
 	} else {
-		struct sockaddr_storage ss;
-
 		ss_len = sizeof ss;
 		ssp = &ss;
 
@@ -160,6 +169,8 @@ void client_sockaddr(int fd,
 		     struct sockaddr_storage *ss,
 		     socklen_t *ss_len)
 {
+	memset(ss, 0, sizeof(*ss));
+
 	if (getpeername(fd, (struct sockaddr *) ss, ss_len)) {
 		/* FIXME: Can we really not continue? */
 		rprintf(FERROR, RSYNC_NAME ": getpeername on fd%d failed: %s\n",
@@ -263,9 +274,23 @@ int compare_addrinfo_sockaddr(const struct addrinfo *ai,
 
 		sin1 = (const struct sockaddr_in6 *) ss;
 		sin2 = (const struct sockaddr_in6 *) ai->ai_addr;
-		
-		return memcmp(&sin1->sin6_addr, &sin2->sin6_addr,
-			      sizeof sin1->sin6_addr);
+
+		if (ai->ai_addrlen < sizeof(struct sockaddr_in6)) {
+			rprintf(FERROR,
+				"%s: too short sockaddr_in6; length=%d\n",
+				fn, ai->ai_addrlen);
+			return 1;
+		}
+
+		if (memcmp(&sin1->sin6_addr, &sin2->sin6_addr,
+			   sizeof sin1->sin6_addr))
+			return 1;
+
+#ifdef HAVE_SOCKADDR_IN6_SCOPE_ID
+		if (sin1->sin6_scope_id != sin2->sin6_scope_id)
+			return 1;
+#endif
+		return 0;
 	}
 #endif /* INET6 */
 	else {