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

With commit 1374c3861abdc66f3a1410e26cc85f86760b51dd Neil added a
-test-client- export to test the exportability of filesystems when exportfs
is run.  When using the old cache controls (i.e. /proc/fs/nfsd is not
mounted) exportfs will read /proc/fs/nfs/exports to process existing
exports and find these test client entries.  The dash at the beginning of
-test-client- will be cause getexportent to look for default options in the
rest of the string, which test-client- will not match:

exportfs: /proc/fs/nfs/exports:1: unknown keyword "test-client-(rw"

This patch resolves that problem (as Steve suggested) by not processing any
default options if we are reading the list of existing exports from the
kernel.  Default options are converted to individual exports by exportfs so
the kernel won't have any regardless.

Signed-off-by: Ben Myers <bpm@sgi.com>
Signed-off-by: Steve Dickson <steved@redhat.com>

diff --git a/support/nfs/exports.c b/support/nfs/exports.c
index 6acb2b650bee9e9e22755fdc6064c7ba7c0fc448..c250383a1b2fe2ada93bc5c8bf172fc02e3ad49b 100644 (file)
--- a/support/nfs/exports.c
+++ b/support/nfs/exports.c
@@ -142,9 +142,14 @@ getexportent(int fromkernel, int fromexports)
                return NULL;
        }
        first = 0;
                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;
                
                if (parseopts(exp + 1, &def_ee, 0, &has_default_subtree_opts) < 0)
                        return NULL;