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);
#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;
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;
}
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) {
}
#endif
- a = (char *)&sin6a->sin6_addr;
- t = (char *)&sin6t->sin6_addr;
- addrlen = 16;
-
break;
}
#endif