utils: Return status 0 on clean exits

[nfs-utils.git] / utils / mountd / cache.c

diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
index c5f8093f4da1bd8f64a1ae94d4dab2cefae74cc9..7d804322a2dfce0a45256dcb44d05297dce7ed5e 100644 (file)
--- a/utils/mountd/cache.c
+++ b/utils/mountd/cache.c
@@ -84,7 +84,6 @@ static void auth_unix_ip(FILE *f)
        char ipaddr[INET6_ADDRSTRLEN];
        char *client = NULL;
        struct addrinfo *tmp = NULL;
-       struct addrinfo *ai = NULL;
        if (readline(fileno(f), &lbuf, &lbuflen) != 1)
                return;
 
@@ -107,12 +106,16 @@ static void auth_unix_ip(FILE *f)
 
        /* addr is a valid, interesting address, find the domain name... */
        if (!use_ipaddr) {
+               struct addrinfo *ai = NULL;
+
                ai = client_resolve(tmp->ai_addr);
+               if (ai == NULL)
+                       goto out;
                client = client_compose(ai);
                freeaddrinfo(ai);
+               if (!client)
+                       goto out;
        }
-       freeaddrinfo(tmp);
-
        qword_print(f, "nfsd");
        qword_print(f, ipaddr);
        qword_printuint(f, time(0) + DEFAULT_TTL);
@@ -124,6 +127,9 @@ static void auth_unix_ip(FILE *f)
        xlog(D_CALL, "auth_unix_ip: client %p '%s'", client, client?client: "DEFAULT");
 
        free(client);
+out:
+       freeaddrinfo(tmp);
+
 }
 
 static void auth_unix_gid(FILE *f)
@@ -500,6 +506,8 @@ struct addrinfo *lookup_client_addr(char *dom)
        struct addrinfo *ret;
        struct addrinfo *tmp;
 
+       dom++; /* skip initial "$" */
+
        tmp = host_pton(dom);
        if (tmp == NULL)
                return NULL;
@@ -551,7 +559,7 @@ static void nfsd_fh(FILE *f)
 
        auth_reload();
 
-       if (use_ipaddr) {
+       if (is_ipaddr_client(dom)) {
                ai = lookup_client_addr(dom);
                if (!ai)
                        goto out;
@@ -587,7 +595,8 @@ static void nfsd_fh(FILE *f)
                                next_exp = exp->m_next;
                        }
 
-                       if (!use_ipaddr && !client_member(dom, exp->m_client->m_hostname))
+                       if (!is_ipaddr_client(dom)
+                                       && !namelist_client_matches(exp, dom))
                                continue;
                        if (exp->m_export.e_mountpoint &&
                            !is_mountpoint(exp->m_export.e_mountpoint[0]?
@@ -597,7 +606,8 @@ static void nfsd_fh(FILE *f)
 
                        if (!match_fsid(&parsed, exp, path))
                                continue;
-                       if (use_ipaddr && !client_check(exp->m_client, ai))
+                       if (is_ipaddr_client(dom)
+                                       && !ipaddr_client_matches(exp, ai))
                                continue;
                        if (!found || subexport(&exp->m_export, found)) {
                                found = &exp->m_export;
@@ -759,14 +769,6 @@ static int path_matches(nfs_export *exp, char *path)
        return strcmp(path, exp->m_export.e_path) == 0;
 }
 
-static int
-client_matches(nfs_export *exp, char *dom, struct addrinfo *ai)
-{
-       if (use_ipaddr)
-               return client_check(exp->m_client, ai);
-       return client_member(dom, exp->m_client->m_hostname);
-}
-
 static int
 export_matches(nfs_export *exp, char *dom, char *path, struct addrinfo *ai)
 {
@@ -1079,7 +1081,7 @@ static void nfsd_export(FILE *f)
 
        auth_reload();
 
-       if (use_ipaddr) {
+       if (is_ipaddr_client(dom)) {
                ai = lookup_client_addr(dom);
                if (!ai)
                        goto out;