nfs-utils: Fix source code character encoding

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

diff --git a/utils/nfsd/nfsd.c b/utils/nfsd/nfsd.c
index 650c59351722a7998d55116267ca17c830da0241..658b8fa905098afb0942db3b80d36a328b03c76b 100644 (file)
--- a/utils/nfsd/nfsd.c
+++ b/utils/nfsd/nfsd.c
@@ -27,6 +27,15 @@
 #include "nfssvc.h"
 #include "xlog.h"
 
+/*
+ * IPv6 support for nfsd was finished before some of the other daemons (mountd
+ * and statd in particular). That could be a problem in the future if someone
+ * were to boot a kernel that supports IPv6 serving with  an older nfs-utils. For
+ * now, hardcode the IPv6 switch into the off position until the other daemons
+ * are functional.
+ */
+#undef IPV6_SUPPORTED
+
 static void    usage(const char *);
 
 static struct option longopts[] =
@@ -237,6 +246,9 @@ main(int argc, char **argv)
                exit(1);
        }
 
+       /* make sure nfsdfs is mounted if it's available */
+       nfssvc_mount_nfsdfs(progname);
+
        /* can only change number of threads if nfsd is already up */
        if (nfssvc_inuse()) {
                socket_up = 1;