exportfs: getexportent interprets -test-client- as default options

[nfs-utils.git] / support / nfs / exports.c

diff --git a/support/nfs/exports.c b/support/nfs/exports.c
index a93941caf0ca6a87fea44d134d7591ee31106aac..c250383a1b2fe2ada93bc5c8bf172fc02e3ad49b 100644 (file)
--- a/support/nfs/exports.c
+++ b/support/nfs/exports.c
@@ -107,6 +107,7 @@ static void init_exportent (struct exportent *ee, int fromkernel)
        ee->e_nsquids = 0;
        ee->e_nsqgids = 0;
        ee->e_uuid = NULL;
+       ee->e_ttl = DEFAULT_TTL;
 }
 
 struct exportent *
@@ -141,9 +142,14 @@ getexportent(int fromkernel, int fromexports)
                return NULL;
        }
        first = 0;
-               
-       /* Check for default options */
-       if (exp[0] == '-') {
+
+       /*
+        * Check for default options.  The kernel will never have default
+        * options in /proc/fs/nfs/exports, however due to the initial '-' in
+        * the -test-client- string from the test export we have to check that
+        * we're not reading from the kernel.
+        */
+       if (exp[0] == '-' && !fromkernel) {
                if (parseopts(exp + 1, &def_ee, 0, &has_default_subtree_opts) < 0)
                        return NULL;
                
@@ -332,6 +338,8 @@ dupexportent(struct exportent *dst, struct exportent *src)
                dst->e_mountpoint = strdup(src->e_mountpoint);
        if (src->e_fslocdata)
                dst->e_fslocdata = strdup(src->e_fslocdata);
+       if (src->e_uuid)
+               dst->e_uuid = strdup(src->e_uuid);
        dst->e_hostname = NULL;
 }