X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmountd%2Fmountd.c;h=d0d8103583818fe50cd38653655f281449be50ef;hp=b1bce1dfc9c45846a25d237e3af552104fb323d7;hb=bce6f6871f481087890674497b4b2154dc4825fc;hpb=936ecbb5750e0e29b9e2464998a8e03eca617b72

diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c
index b1bce1d..d0d8103 100644
--- a/utils/mountd/mountd.c
+++ b/utils/mountd/mountd.c
@@ -282,6 +282,13 @@ get_rootfh(struct svc_req *rqstp, dirpath *path, int *error, int v3)
 		xlog(L_WARNING, "request to export directory %s below nearest filesystem %s",
 		     p, exp->m_export.e_path);
 		*error = NFSERR_ACCES;
+	} else if (exp->m_export.e_mountpoint &&
+		   !is_mountpoint(exp->m_export.e_mountpoint[0]?
+				  exp->m_export.e_mountpoint:
+				  exp->m_export.e_path)) {
+		xlog(L_WARNING, "request to export an unmounted filesystem: %s",
+		     p);
+		*error = NFSERR_NOENT;
 	} else if (new_cache) {
 		/* This will be a static private nfs_export with just one
 		 * address.  We feed it to kernel then extract the filehandle,
@@ -424,14 +431,14 @@ main(int argc, char **argv)
 	char	*export_file = _PATH_EXPORTS;
 	int	foreground = 0;
 	int	port = 0;
-	int	descriptors = 256;
+	int	descriptors = 0;
 	int	c;
 	struct sigaction sa;
 	struct rlimit rlim;
 
 	/* Parse the command line options and arguments. */
 	opterr = 0;
-	while ((c = getopt_long(argc, argv, "on:Fd:f:p:P:hN:V:v", longopts, NULL)) != EOF)
+	while ((c = getopt_long(argc, argv, "o:n:Fd:f:p:P:hN:V:v", longopts, NULL)) != EOF)
 		switch (c) {
 		case 'o':
 			descriptors = atoi(optarg);
@@ -491,19 +498,20 @@ main(int argc, char **argv)
 		exit(1);
 	}
 
-	if (getrlimit (RLIMIT_NOFILE, &rlim) != 0) {
-		fprintf(stderr, "%s: getrlimit (RLIMIT_NOFILE) failed: %s\n",
-			argv [0], strerror(errno));
-		exit(1);
-	}
+	if (descriptors) {
+		if (getrlimit (RLIMIT_NOFILE, &rlim) != 0) {
+			fprintf(stderr, "%s: getrlimit (RLIMIT_NOFILE) failed: %s\n",
+				argv [0], strerror(errno));
+			exit(1);
+		}
 
-	rlim.rlim_cur = descriptors;
-	if (setrlimit (RLIMIT_NOFILE, &rlim) != 0) {
-		fprintf(stderr, "%s: setrlimit (RLIMIT_NOFILE) failed: %s\n",
-			argv [0], strerror(errno));
-		exit(1);
+		rlim.rlim_cur = descriptors;
+		if (setrlimit (RLIMIT_NOFILE, &rlim) != 0) {
+			fprintf(stderr, "%s: setrlimit (RLIMIT_NOFILE) failed: %s\n",
+				argv [0], strerror(errno));
+			exit(1);
+		}
 	}
-
 	/* Initialize logging. */
 /*	xlog_open("mountd"); */
 
@@ -513,6 +521,7 @@ main(int argc, char **argv)
 	sigaction(SIGHUP, &sa, NULL);
 	sigaction(SIGINT, &sa, NULL);
 	sigaction(SIGTERM, &sa, NULL);
+	sigaction(SIGPIPE, &sa, NULL);
 	/* WARNING: the following works on Linux and SysV, but not BSD! */
 	sigaction(SIGCHLD, &sa, NULL);