X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/bc2b4963a009dd8194b2e9f996a63b9c634a6263..16417f8b9d1947f4efbe540ee6983feba2ebc21c:/access.c

diff --git a/access.c b/access.c
index aec633a7..25a0680a 100644
--- a/access.c
+++ b/access.c
@@ -51,7 +51,8 @@ static void make_mask(char *mask, int plen, int addrlen) {
 
 	if (w)
 		memset(mask, 0xff, w);
-	mask[w] = 0xff & (0xff<<(8-b));
+	if (w < addrlen)
+		mask[w] = 0xff & (0xff<<(8-b));
 	if (w+1 < addrlen)
 		memset(mask+w+1, 0, addrlen-w-1);
 
@@ -72,16 +73,31 @@ static int match_address(char *addr, char *tok)
 #endif
 	char mask[16];
 	char *a = NULL, *t = NULL;
+	unsigned int len;
 
 	if (!addr || !*addr) return 0;
 
 	p = strchr(tok,'/');
-	if (p) *p = 0;
+	if (p) {
+		*p = '\0';
+		len = p - tok;
+	}
+	else
+		len = strlen(tok);
+
+	/* Fail quietly if tok is a hostname (not an address) */
+	if (strspn(tok, ".0123456789") != len
+#ifdef INET6
+	 && !strchr(tok, ':')
+#endif
+		) return 0;
 
 	memset(&hints, 0, sizeof(hints));
 	hints.ai_family = PF_UNSPEC;
 	hints.ai_socktype = SOCK_STREAM;
+#ifdef AI_NUMERICHOST
 	hints.ai_flags = AI_NUMERICHOST;
+#endif
 
 	gai = getaddrinfo(addr, NULL, &hints, &resa);
 	if (gai) return 0;
@@ -90,7 +106,10 @@ static int match_address(char *addr, char *tok)
 	if (p)
 		*p++ = '/';
 	if (gai) {
-		rprintf(FERROR,"malformed address %s\n", tok);
+		rprintf(FERROR,
+			"error matching address %s: %s\n",
+			tok,
+			gai_strerror(gai));
 		freeaddrinfo(resa);
 		return 0;
 	}
@@ -119,6 +138,8 @@ static int match_address(char *addr, char *tok)
 		a = (char *)&sin6a->sin6_addr;
 		t = (char *)&sin6t->sin6_addr;
 
+		addrlen = 16;
+
 #ifdef HAVE_SOCKADDR_IN6_SCOPE_ID
 		if (sin6t->sin6_scope_id &&
 		    sin6a->sin6_scope_id != sin6t->sin6_scope_id) {
@@ -127,10 +148,6 @@ static int match_address(char *addr, char *tok)
 		}
 #endif
 
-		a = (char *)&sin6a->sin6_addr;
-		t = (char *)&sin6t->sin6_addr;
-		addrlen = 16;
-
 		break;
 	    }
 #endif