mountd: Warn when a broken junction is encountered

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

diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
index be5198e84c830a8df418fc2e081a1a127e90af55..942fdbd030f19f59665681acde3aeaf06b6dd308 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 && !namelist_client_matches(exp, dom))
+                       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 && !ipaddr_client_matches(exp, ai))
+                       if (is_ipaddr_client(dom)
+                                       && !ipaddr_client_matches(exp, ai))
                                continue;
                        if (!found || subexport(&exp->m_export, found)) {
                                found = &exp->m_export;
@@ -965,8 +975,8 @@ static struct exportent *locations_to_export(struct jp_ops *ops,
 static struct exportent *invoke_junction_ops(void *handle,
                const char *junction)
 {
+       struct exportent *exp = NULL;
        nfs_fsloc_set_t locations;
-       struct exportent *exp;
        enum jp_status status;
        struct jp_ops *ops;
        char *error;
@@ -992,15 +1002,24 @@ static struct exportent *invoke_junction_ops(void *handle,
        }
 
        status = ops->jp_get_locations(junction, &locations);
-       if (status != JP_OK) {
-               xlog(D_GENERAL, "%s: failed to resolve %s: %s",
-                       __func__, junction, ops->jp_error(status));
-               return NULL;
+       switch (status) {
+       case JP_OK:
+               break;
+       case JP_NOTJUNCTION:
+               xlog(D_GENERAL, "%s: %s is not a junction",
+                       __func__, junction);
+               goto out;
+       default:
+               xlog(L_WARNING, "Dangling junction %s: %s",
+                       junction, ops->jp_error(status));
+               goto out;
        }
 
        exp = locations_to_export(ops, locations, junction);
 
        ops->jp_put_locations(locations);
+
+out:
        ops->jp_done();
        return exp;
 }
@@ -1071,7 +1090,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;