Make idev, hlink and file_struct + strings use allocation

[rsync/rsync.git] / access.c

diff --git a/access.c b/access.c
index 710a1af..1dc73ae 100644 (file)
--- a/access.c
+++ b/access.c
@@ -27,7 +27,7 @@
 static int match_hostname(char *host, char *tok)
 {
        if (!host || !*host) return 0;
-       return (fnmatch(tok, host, 0) == 0);
+       return wildmatch(tok, host);
 }
 
 static int match_binary(char *b1, char *b2, char *mask, int addrlen)
@@ -86,10 +86,9 @@ static int match_address(char *addr, char *tok)
                len = strlen(tok);
 
        /* Fail quietly if tok is a hostname (not an address) */
-       if (strspn(tok, "./0123456789") != len
+       if (strspn(tok, ".0123456789") != len
 #ifdef INET6
-        && strspn(tok, "/0123456789:ABCDEFabcdef") != len
-        && !strchr(tok, '%')
+        && !strchr(tok, ':')
 #endif
                ) return 0;