export: Ensure that we free struct exportent->e_uuid

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

diff --git a/support/nfs/exports.c b/support/nfs/exports.c
index ef31a8556bd7621b9fb092028b37ac25787ad05b..1744ed667e2dd0e5df186565a4c5aea2914ddce9 100644 (file)
--- a/support/nfs/exports.c
+++ b/support/nfs/exports.c
@@ -84,6 +84,31 @@ setexportent(char *fname, char *type)
        first = 1;
 }
 
+static void init_exportent (struct exportent *ee, int fromkernel)
+{
+       ee->e_flags = EXPORT_DEFAULT_FLAGS;
+       /* some kernels assume the default is sync rather than
+        * async.  More recent kernels always report one or other,
+        * but this test makes sure we assume same as kernel
+        * Ditto for wgather
+        */
+       if (fromkernel) {
+               ee->e_flags &= ~NFSEXP_ASYNC;
+               ee->e_flags &= ~NFSEXP_GATHERED_WRITES;
+       }
+       ee->e_anonuid = 65534;
+       ee->e_anongid = 65534;
+       ee->e_squids = NULL;
+       ee->e_sqgids = NULL;
+       ee->e_mountpoint = NULL;
+       ee->e_fslocmethod = FSLOC_NONE;
+       ee->e_fslocdata = NULL;
+       ee->e_secinfo[0].flav = NULL;
+       ee->e_nsquids = 0;
+       ee->e_nsqgids = 0;
+       ee->e_uuid = NULL;
+}
+
 struct exportent *
 getexportent(int fromkernel, int fromexports)
 {
@@ -102,26 +127,7 @@ getexportent(int fromkernel, int fromexports)
                has_default_opts = 0;
                has_default_subtree_opts = 0;
        
-               def_ee.e_flags = EXPORT_DEFAULT_FLAGS;
-               /* some kernels assume the default is sync rather than
-                * async.  More recent kernels always report one or other,
-                * but this test makes sure we assume same as kernel
-                * Ditto for wgather
-                */
-               if (fromkernel) {
-                       def_ee.e_flags &= ~NFSEXP_ASYNC;
-                       def_ee.e_flags &= ~NFSEXP_GATHERED_WRITES;
-               }
-               def_ee.e_anonuid = 65534;
-               def_ee.e_anongid = 65534;
-               def_ee.e_squids = NULL;
-               def_ee.e_sqgids = NULL;
-               def_ee.e_mountpoint = NULL;
-               def_ee.e_fslocmethod = FSLOC_NONE;
-               def_ee.e_fslocdata = NULL;
-               def_ee.e_secinfo[0].flav = NULL;
-               def_ee.e_nsquids = 0;
-               def_ee.e_nsqgids = 0;
+               init_exportent(&def_ee, fromkernel);
 
                ok = getpath(def_ee.e_path, sizeof(def_ee.e_path));
                if (ok <= 0)
@@ -326,6 +332,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;
 }
 
@@ -334,18 +342,7 @@ mkexportent(char *hname, char *path, char *options)
 {
        static struct exportent ee;
 
-       ee.e_flags = EXPORT_DEFAULT_FLAGS;
-       ee.e_anonuid = 65534;
-       ee.e_anongid = 65534;
-       ee.e_squids = NULL;
-       ee.e_sqgids = NULL;
-       ee.e_mountpoint = NULL;
-       ee.e_fslocmethod = FSLOC_NONE;
-       ee.e_fslocdata = NULL;
-       ee.e_secinfo[0].flav = NULL;
-       ee.e_nsquids = 0;
-       ee.e_nsqgids = 0;
-       ee.e_uuid = NULL;
+       init_exportent(&ee, 0);
 
        xfree(ee.e_hostname);
        ee.e_hostname = xstrdup(hname);
@@ -385,7 +382,7 @@ static int valid_uuid(char *uuid)
  * do nothing if it's already there.  Returns the index of flavor
  * in the resulting array in any case.
  */
-static int secinfo_addflavor(struct flav_info *flav, struct exportent *ep)
+int secinfo_addflavor(struct flav_info *flav, struct exportent *ep)
 {
        struct sec_entry *p;
 
@@ -646,12 +643,6 @@ bad_option:
                        cp++;
        }
 
-       /*
-        * Turn on nohide which will allow this export to cross over
-        * the 'mount --bind' mount point.
-        */
-       if (ep->e_fslocdata)
-               setflags(NFSEXP_NOHIDE, active, ep);
        fix_pseudoflavor_flags(ep);
        ep->e_squids = squids;
        ep->e_sqgids = sqgids;