export: Ensure that we free struct exportent->e_uuid

Currently, the exportent->e_uuid is initialised in
support/nfs/exports.c:parseopts(), but it is never freed.

Also ensure that exportent->e_uuid is duplicated correctly in
dupexportent().

Adjusted to account for the new export_free() helper.

Also, e_uuid points to memory that is always allocated with strdup(3),
not with xstrdup().  Thus it must be freed via free(3) and not via
xfree().

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
Signed-off-by: Steve Dickson <steved@redhat.com>

diff --git a/support/export/export.c b/support/export/export.c
index f528603b686bb541a47a823b71b3dbdac8ff4ec6..4fda30a799169e232e42b56d63579e315748c3c9 100644 (file)
--- a/support/export/export.c
+++ b/support/export/export.c
@@ -38,6 +38,7 @@ export_free(nfs_export *exp)
        xfree(exp->m_export.e_sqgids);
        free(exp->m_export.e_mountpoint);
        free(exp->m_export.e_fslocdata);
        xfree(exp->m_export.e_sqgids);
        free(exp->m_export.e_mountpoint);
        free(exp->m_export.e_fslocdata);

+       free(exp->m_export.e_uuid);

 
        xfree(exp->m_export.e_hostname);
        xfree(exp);
 
        xfree(exp->m_export.e_hostname);
        xfree(exp);

diff --git a/support/nfs/exports.c b/support/nfs/exports.c
index a93941caf0ca6a87fea44d134d7591ee31106aac..1744ed667e2dd0e5df186565a4c5aea2914ddce9 100644 (file)
--- a/support/nfs/exports.c
+++ b/support/nfs/exports.c
@@ -332,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);
                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;
 }
 
        dst->e_hostname = NULL;
 }