mountd: fix exporting of "/" with sec= setting.

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

diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
index e950ec6a2adda66e49f0dbfaeb8e5105ce51f608..737927c78e8549c83ccf358b0f1636f353d303b6 100644 (file)
--- a/utils/mountd/cache.c
+++ b/utils/mountd/cache.c
@@ -29,7 +29,6 @@
 #include "nfslib.h"
 #include "exportfs.h"
 #include "mountd.h"
-#include "xmalloc.h"
 #include "fsloc.h"
 #include "pseudoflavors.h"
 
@@ -81,7 +80,7 @@ static void auth_unix_ip(FILE *f)
         */
        char *cp;
        char class[20];
-       char ipaddr[INET6_ADDRSTRLEN];
+       char ipaddr[INET6_ADDRSTRLEN + 1];
        char *client = NULL;
        struct addrinfo *tmp = NULL;
        if (readline(fileno(f), &lbuf, &lbuflen) != 1)
@@ -95,7 +94,7 @@ static void auth_unix_ip(FILE *f)
            strcmp(class, "nfsd") != 0)
                return;
 
-       if (qword_get(&cp, ipaddr, sizeof(ipaddr)) <= 0)
+       if (qword_get(&cp, ipaddr, sizeof(ipaddr) - 1) <= 0)
                return;
 
        tmp = host_pton(ipaddr);
@@ -109,25 +108,24 @@ static void auth_unix_ip(FILE *f)
                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;
+               if (ai) {
+                       client = client_compose(ai);
+                       freeaddrinfo(ai);
+               }
        }
        qword_print(f, "nfsd");
        qword_print(f, ipaddr);
        qword_printtimefrom(f, DEFAULT_TTL);
-       if (use_ipaddr)
+       if (use_ipaddr) {
+               memmove(ipaddr + 1, ipaddr, strlen(ipaddr) + 1);
+               ipaddr[0] = '$';
                qword_print(f, ipaddr);
-       else if (client)
+       } else if (client)
                qword_print(f, *client?client:"DEFAULT");
        qword_eol(f);
        xlog(D_CALL, "auth_unix_ip: client %p '%s'", client, client?client: "DEFAULT");
 
        free(client);
-out:
        freeaddrinfo(tmp);
 
 }
@@ -347,6 +345,30 @@ static char *next_mnt(void **v, char *p)
        return me->mnt_dir;
 }
 
+static int is_subdirectory(char *child, char *parent)
+{
+       size_t l = strlen(parent);
+
+       if (strcmp(parent, "/") == 0)
+               return 1;
+
+       return strcmp(child, parent) == 0
+               || (strncmp(child, parent, l) == 0 && child[l] == '/');
+}
+
+static int path_matches(nfs_export *exp, char *path)
+{
+       if (exp->m_export.e_flags & NFSEXP_CROSSMOUNT)
+               return is_subdirectory(path, exp->m_export.e_path);
+       return strcmp(path, exp->m_export.e_path) == 0;
+}
+
+static int
+export_matches(nfs_export *exp, char *dom, char *path, struct addrinfo *ai)
+{
+       return path_matches(exp, path) && client_matches(exp, dom, ai);
+}
+
 /* True iff e1 is a child of e2 and e2 has crossmnt set: */
 static bool subexport(struct exportent *e1, struct exportent *e2)
 {
@@ -354,8 +376,8 @@ static bool subexport(struct exportent *e1, struct exportent *e2)
        size_t l2 = strlen(p2);
 
        return e2->e_flags & NFSEXP_CROSSMOUNT
-              && strncmp(p1, p2, l2) == 0
-              && p1[l2] == '/';
+               && strncmp(p1, p2, l2) == 0
+               && p1[l2] == '/';
 }
 
 struct parsed_fsid {
@@ -715,6 +737,7 @@ static void write_secinfo(FILE *f, struct exportent *ep, int flag_mask)
                /* There was no sec= option */
                return;
        }
+       fix_pseudoflavor_flags(ep);
        qword_print(f, "secinfo");
        qword_printint(f, p - ep->e_secinfo);
        for (p = ep->e_secinfo; p->flav; p++) {
@@ -756,27 +779,6 @@ static int dump_to_cache(FILE *f, char *domain, char *path, struct exportent *ex
        return qword_eol(f);
 }
 
-static int is_subdirectory(char *child, char *parent)
-{
-       size_t l = strlen(parent);
-
-       return strcmp(child, parent) == 0
-               || (strncmp(child, parent, l) == 0 && child[l] == '/');
-}
-
-static int path_matches(nfs_export *exp, char *path)
-{
-       if (exp->m_export.e_flags & NFSEXP_CROSSMOUNT)
-               return is_subdirectory(path, exp->m_export.e_path);
-       return strcmp(path, exp->m_export.e_path) == 0;
-}
-
-static int
-export_matches(nfs_export *exp, char *dom, char *path, struct addrinfo *ai)
-{
-       return path_matches(exp, path) && client_matches(exp, dom, ai);
-}
-
 static nfs_export *
 lookup_export(char *dom, char *path, struct addrinfo *ai)
 {
@@ -830,6 +832,7 @@ lookup_export(char *dom, char *path, struct addrinfo *ai)
 
 #ifdef HAVE_NFS_PLUGIN_H
 #include <dlfcn.h>
+#include <link.h>
 #include <nfs-plugin.h>
 
 /*
@@ -1094,6 +1097,7 @@ static struct exportent *lookup_junction(char *dom, const char *pathname,
                struct addrinfo *ai)
 {
        struct exportent *exp;
+       struct link_map *map;
        void *handle;
 
        handle = dlopen("libnfsjunct.so", RTLD_NOW);
@@ -1101,6 +1105,11 @@ static struct exportent *lookup_junction(char *dom, const char *pathname,
                xlog(D_GENERAL, "%s: dlopen: %s", __func__, dlerror());
                return NULL;
        }
+
+       if (dlinfo(handle, RTLD_DI_LINKMAP, &map) == 0)
+               xlog(D_GENERAL, "%s: loaded plug-in %s",
+                       __func__, map->l_name);
+
        (void)dlerror();        /* Clear any error */
 
        exp = invoke_junction_ops(handle, dom, pathname, ai);