mountd: Set e_fslocdata field directly

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

diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
index 7d804322a2dfce0a45256dcb44d05297dce7ed5e..f63803bddb31a2e5bab1e974b9e1bc05402f9677 100644 (file)
--- a/utils/mountd/cache.c
+++ b/utils/mountd/cache.c
@@ -831,12 +831,12 @@ lookup_export(char *dom, char *path, struct addrinfo *ai)
 #include <nfs-plugin.h>
 
 /*
- * Walk through a set of FS locations and build a set of export options.
+ * Walk through a set of FS locations and build an e_fslocdata string.
  * Returns true if all went to plan; otherwise, false.
  */
-static _Bool
-locations_to_options(struct jp_ops *ops, nfs_fsloc_set_t locations,
-               char *options, size_t remaining, int *ttl)
+static bool locations_to_fslocdata(struct jp_ops *ops,
+               nfs_fsloc_set_t locations, char *fslocdata,
+               size_t remaining, int *ttl)
 {
        char *server, *last_path, *rootpath, *ptr;
        _Bool seen = false;
@@ -844,7 +844,7 @@ locations_to_options(struct jp_ops *ops, nfs_fsloc_set_t locations,
        last_path = NULL;
        rootpath = NULL;
        server = NULL;
-       ptr = options;
+       ptr = fslocdata;
        *ttl = 0;
 
        for (;;) {
@@ -870,14 +870,14 @@ locations_to_options(struct jp_ops *ops, nfs_fsloc_set_t locations,
                                goto out_false;
                        }
                        if ((size_t)len >= remaining) {
-                               xlog(D_GENERAL, "%s: options buffer overflow", __func__);
+                               xlog(D_GENERAL, "%s: fslocdata buffer overflow", __func__);
                                goto out_false;
                        }
                        remaining -= (size_t)len;
                        ptr += len;
                } else {
                        if (last_path == NULL)
-                               len = snprintf(ptr, remaining, "refer=%s@%s",
+                               len = snprintf(ptr, remaining, "%s@%s",
                                                        rootpath, server);
                        else
                                len = snprintf(ptr, remaining, ":%s@%s",
@@ -887,7 +887,7 @@ locations_to_options(struct jp_ops *ops, nfs_fsloc_set_t locations,
                                goto out_false;
                        }
                        if ((size_t)len >= remaining) {
-                               xlog(D_GENERAL, "%s: options buffer overflow",
+                               xlog(D_GENERAL, "%s: fslocdata buffer overflow",
                                        __func__);
                                goto out_false;
                        }
@@ -901,8 +901,8 @@ locations_to_options(struct jp_ops *ops, nfs_fsloc_set_t locations,
                free(server);
        }
 
-       xlog(D_CALL, "%s: options='%s', ttl=%d",
-               __func__, options, *ttl);
+       xlog(D_CALL, "%s: fslocdata='%s', ttl=%d",
+               __func__, fslocdata, *ttl);
        return seen;
 
 out_false:
@@ -917,17 +917,19 @@ out_false:
  *
  * Returned exportent points to static memory.
  */
-static struct exportent *do_locations_to_export(struct jp_ops *ops,
-               nfs_fsloc_set_t locations, const char *junction,
-               char *options, size_t options_len)
+static struct exportent *locations_to_export(struct jp_ops *ops,
+               nfs_fsloc_set_t locations, const char *junction)
 {
+       static char fslocdata[BUFSIZ];
        struct exportent *exp;
        int ttl;
 
-       if (!locations_to_options(ops, locations, options, options_len, &ttl))
+       fslocdata[0] = '\0';
+       if (!locations_to_fslocdata(ops, locations,
+                                       fslocdata, sizeof(fslocdata), &ttl))
                return NULL;
 
-       exp = mkexportent("*", (char *)junction, options);
+       exp = mkexportent("*", (char *)junction, "");
        if (exp == NULL) {
                xlog(L_ERROR, "%s: Failed to construct exportent", __func__);
                return NULL;
@@ -935,33 +937,14 @@ static struct exportent *do_locations_to_export(struct jp_ops *ops,
 
        exp->e_uuid = NULL;
        exp->e_ttl = ttl;
-       return exp;
-}
-
-/*
- * Convert set of FS locations to an exportent.  Returns pointer to
- * an exportent if "junction" refers to a junction.
- *
- * Returned exportent points to static memory.
- */
-static struct exportent *locations_to_export(struct jp_ops *ops,
-               nfs_fsloc_set_t locations, const char *junction)
-{
-       struct exportent *exp;
-       char *options;
 
-       options = malloc(BUFSIZ);
-       if (options == NULL) {
-               xlog(D_GENERAL, "%s: failed to allocate options buffer",
-                       __func__);
+       free(exp->e_fslocdata);
+       exp->e_fslocmethod = FSLOC_REFER;
+       exp->e_fslocdata = strdup(fslocdata);
+       if (exp->e_fslocdata == NULL) {
+               xlog(L_ERROR, "%s: No memory", __func__);
                return NULL;
        }
-       options[0] = '\0';
-
-       exp = do_locations_to_export(ops, locations, junction,
-                                               options, BUFSIZ);
-
-       free(options);
        return exp;
 }
 
@@ -975,8 +958,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;
@@ -1002,15 +985,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;
 }