./configure (optional if already run)
make
+based-on: a01e3b490eb36ccf9e704840e1b6683dab867550
diff --git a/access.c b/access.c
--- a/access.c
+++ b/access.c
-@@ -210,6 +210,43 @@ static int match_address(char *addr, char *tok)
+@@ -210,6 +210,38 @@ static int match_address(const char *addr, const char *tok)
return ret;
}
-+static int match_hostlookup(char *addr, char *tok)
++static int match_hostlookup(const char *addr, const char *tok)
+{
-+ struct hostent *hp;
++ struct hostent *hp = NULL;
+ unsigned int i, len;
-+ int failed;
-+ char *p;
++ const char *p;
+
-+ if ((p = strchr(tok,'/')) != NULL) {
-+ *p = '\0';
++ if ((p = strchr(tok,'/')) != NULL)
+ len = p - tok;
-+ } else
++ else
+ len = strlen(tok);
+
-+ /* Fail quietly if tok is an address (not a hostname) */
-+ failed = strspn(tok, ".0123456789") == len;
++ /* Fail quietly (hp left NULL) if tok is an address, not a hostname. */
+#ifdef INET6
-+ failed ||= strchr(tok, ':') != NULL;
++ if (strcspn(tok, ":/") != len) {
++ ;
++ } else
+#endif
++ if (strspn(tok, ".0123456789") != len)
++ hp = gethostbyname(tok);
+
-+ if (!failed && (hp = gethostbyname(tok)) == NULL)
-+ failed = 1;
-+
-+ if (p)
-+ *p = '/';
-+
-+ if (failed)
++ if (!hp)
+ return 0;
+
+ for (i = 0; hp->h_addr_list[i] != NULL; i++) {
+ return 0;
+}
+
- static int access_match(char *list, char *addr, char *host)
+ static int access_match(const char *list, const char *addr, const char *host)
{
char *tok;
-@@ -223,7 +260,7 @@ static int access_match(char *list, char *addr, char *host)
- strlower(host);
+@@ -221,7 +253,7 @@ static int access_match(const char *list, const char *addr, const char *host)
+ strlower(list2);
for (tok = strtok(list2, " ,\t"); tok; tok = strtok(NULL, " ,\t")) {
- if (match_hostname(host, tok) || match_address(addr, tok)) {