Fixes to make unexporting and exporting with wildcards

[nfs-utils.git] / utils / exportfs / exportfs.c

diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
index 936dff5cebec56d140028b4af98aa29948a5030d..ab8a4a23bec6618283b3cfbbdca4181199c71df4 100644 (file)
--- a/utils/exportfs/exportfs.c
+++ b/utils/exportfs/exportfs.c
@@ -147,6 +147,16 @@ exports_update(int verbose)
        nfs_export      *exp;
 
        for (exp = exportlist[MCL_FQDN]; exp; exp=exp->m_next) {
+               /* check mountpoint option */
+               if (exp->m_mayexport && 
+                   exp->m_export.e_mountpoint &&
+                   !is_mountpoint(exp->m_export.e_mountpoint[0]?
+                                  exp->m_export.e_mountpoint:
+                                  exp->m_export.e_path)) {
+                       printf("%s not exported as %s not a mountpoint.\n",
+                              exp->m_export.e_path, exp->m_export.e_mountpoint);
+                       exp->m_mayexport = 0;
+               }
                if (exp->m_mayexport && ((exp->m_exported<1) || exp->m_changed)) {
                        if (verbose)
                                printf("%sexporting %s:%s to kernel\n",
@@ -273,10 +283,14 @@ unexportfs(char *arg, int verbose)
        for (exp = exportlist[htype]; exp; exp = exp->m_next) {
                if (path && strcmp(path, exp->m_export.e_path))
                        continue;
-               if (htype != exp->m_client->m_type
-                   || (htype == MCL_FQDN
-                       && !matchhostname(exp->m_export.e_hostname,
-                                         hname)))
+               if (htype != exp->m_client->m_type)
+                       continue;
+               if (htype == MCL_FQDN
+                   && !matchhostname(exp->m_export.e_hostname,
+                                         hname))
+                       continue;
+               if (htype != MCL_FQDN
+                   && strcasecmp(exp->m_export.e_hostname, hname))
                        continue;
                if (verbose) {
 #if 0
@@ -366,6 +380,10 @@ dump(int verbose)
                                c = dumpopt(c, "insecure_locks");
                        if (ep->e_flags & NFSEXP_FSID)
                                c = dumpopt(c, "fsid=%d", ep->e_fsid);
+                       if (ep->e_mountpoint)
+                               c = dumpopt(c, "mountpoint%s%s", 
+                                           ep->e_mountpoint[0]?"=":"", 
+                                           ep->e_mountpoint);
                        if (ep->e_maptype == CLE_MAP_UGIDD)
                                c = dumpopt(c, "mapping=ugidd");
                        else if (ep->e_maptype == CLE_MAP_FILE)