Merge branch 'branch-1-0'

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

diff --git a/support/nfs/exports.c b/support/nfs/exports.c
index 31b38c3735b7be7776fac5cefd9e31cfa3775a53..963801583e57ba99adeacfd434379453ad3bad3b 100644 (file)
--- a/support/nfs/exports.c
+++ b/support/nfs/exports.c
@@ -32,7 +32,7 @@
 #include "xio.h"
 
 #define EXPORT_DEFAULT_FLAGS   \
-  (NFSEXP_READONLY|NFSEXP_ROOTSQUASH|NFSEXP_GATHERED_WRITES)
+  (NFSEXP_READONLY|NFSEXP_ROOTSQUASH|NFSEXP_GATHERED_WRITES|NFSEXP_NOSUBTREECHECK)
 
 int export_errno;
 
@@ -236,9 +236,11 @@ putexportent(struct exportent *ep)
        case FSLOC_REPLICA:
                fprintf(fp, "replicas=%s,", ep->e_fslocdata);
                break;
+#ifdef DEBUG
        case FSLOC_STUB:
                fprintf(fp, "fsloc=stub,");
                break;
+#endif
        default:
                xlog(L_ERROR, "unknown fsloc method for %s:%s",
                     ep->e_hostname, ep->e_path);
@@ -504,6 +506,7 @@ bad_option:
                                ep->e_mountpoint = strdup(mp+1);
                        else
                                ep->e_mountpoint = strdup("");
+#ifdef DEBUG
                } else if (strncmp(opt, "fsloc=", 6) == 0) {
                        if (strcmp(opt+6, "stub") == 0)
                                ep->e_fslocmethod = FSLOC_STUB;
@@ -512,6 +515,7 @@ bad_option:
                                     flname, flline, opt);
                                goto bad_option;
                        }
+#endif
                } else if (strncmp(opt, "refer=", 6) == 0) {
                        ep->e_fslocmethod = FSLOC_REFER;
                        ep->e_fslocdata = strdup(opt+6);
@@ -537,8 +541,8 @@ bad_option:
 out:
        if (warn && !had_subtree_opt)
                xlog(L_WARNING, "%s [%d]: Neither 'subtree_check' or 'no_subtree_check' specified for export \"%s:%s\".\n"
-                               "  Assuming default behaviour ('subtree_check').\n"
-                               "  NOTE: this default will change with nfs-utils version 1.1.0\n",
+                               "  Assuming default behaviour ('no_subtree_check').\n"
+                               "  NOTE: this default has changed since nfs-utils version 1.0.x\n",
 
                                flname, flline,
                                ep->e_hostname, ep->e_path);