Call setgroups(1, &gid) after setting the gid (rather than calling

[rsync.git] / access.c

diff --git a/access.c b/access.c
index d792eafd1dd241426f04f078a9ae63698eb9fec8..1dc73aedf399a22941100603a3c0172d379e691e 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)
@@ -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,11 +73,24 @@ 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;
@@ -92,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;
        }
@@ -121,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) {
@@ -129,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