add reporting of nohide, insecure_locks and no_subtree_check in

exportfs -V
cvs: ----------------------------------------------------------------------

diff --git a/ChangeLog b/ChangeLog
index 3dddcfe8b1334b7c2b273ff8ae9f4392cf0c5208..adbfe1e00fca6bad206c01b9713b205e3f0aeed9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar  8 09:42:43 EST 2000 Neil Brown <neilb@cse.unsw.edu.au>
+
+       * utils/exportfs/exportfs.c (dump): Included printing of
+          nohide, no_subtree_check, and insecure_locks
+

 2000-02-26  Chip Salzenberg  <chip@valinux.com>
 
        * config.mk.in (INSTALLSUID): Strip ("-s").
 2000-02-26  Chip Salzenberg  <chip@valinux.com>
 
        * config.mk.in (INSTALLSUID): Strip ("-s").


@@ -10,7 +15,7 @@
        * utils/lockd/Makefile: Install it.
        * utils/nhfsstone/nhfs{run,nums,graph}.man: Create.
        * utils/nhfsstone/nhfsstone.man: Change suffix from ".1".
        * utils/lockd/Makefile: Install it.
        * utils/nhfsstone/nhfs{run,nums,graph}.man: Create.
        * utils/nhfsstone/nhfsstone.man: Change suffix from ".1".

-       * utils/nhfsstone/Makefile: Install the helper scripts ann
+       * utils/nhfsstone/Makefile: Install the helper scripts and

          all four man pages.
        * utils/exportfs/exports.man: Fix typo.
 
          all four man pages.
        * utils/exportfs/exports.man: Fix typo.
 

diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
index 44761f89898d69ef3ff08127665dda6560eae3c0..c3bb5ba3f89afb5ce0d050190f3ef1b4d865f7cd 100644 (file)
--- a/utils/exportfs/exportfs.c
+++ b/utils/exportfs/exportfs.c
@@ -354,6 +354,8 @@ dump(int verbose)
                                c = dumpopt(c, "async");
                        if (ep->e_flags & NFSEXP_GATHERED_WRITES)
                                c = dumpopt(c, "wdelay");
                                c = dumpopt(c, "async");
                        if (ep->e_flags & NFSEXP_GATHERED_WRITES)
                                c = dumpopt(c, "wdelay");

+                       if (ep->e_flags & NFSEXP_CROSSMNT)
+                               c = dumpopt(c, "nohide");

                        if (ep->e_flags & NFSEXP_INSECURE_PORT)
                                c = dumpopt(c, "insecure");
                        if (ep->e_flags & NFSEXP_ROOTSQUASH)
                        if (ep->e_flags & NFSEXP_INSECURE_PORT)
                                c = dumpopt(c, "insecure");
                        if (ep->e_flags & NFSEXP_ROOTSQUASH)


@@ -362,6 +364,10 @@ dump(int verbose)
                                c = dumpopt(c, "no_root_squash");
                        if (ep->e_flags & NFSEXP_ALLSQUASH)
                                c = dumpopt(c, "all_squash");
                                c = dumpopt(c, "no_root_squash");
                        if (ep->e_flags & NFSEXP_ALLSQUASH)
                                c = dumpopt(c, "all_squash");

+                       if (ep->e_flags & NFSEXP_NOSUBTREECHECK)
+                               c = dumpopt(c, "no_subtree_check");
+                       if (ep->e_flags & NFSEXP_NOAUTHNLM)
+                               c = dumpopt(c, "insecure_locks");

                        if (ep->e_maptype == CLE_MAP_UGIDD)
                                c = dumpopt(c, "mapping=ugidd");
                        else if (ep->e_maptype == CLE_MAP_FILE)
                        if (ep->e_maptype == CLE_MAP_UGIDD)
                                c = dumpopt(c, "mapping=ugidd");
                        else if (ep->e_maptype == CLE_MAP_FILE)