X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=utils%2Fmountd%2Fmountd.c;h=145a4daa555691ec4748287205eb2bb1a98b6175;hb=1275be70ca6cd6c4bec07a3381f7b510086c5526;hp=b5779716148d33eaeb6ec6949e8660f6439aea55;hpb=8f4b4516cb37211057e775756b5701c4be050648;p=nfs-utils.git

diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c
index b577971..145a4da 100644
--- a/utils/mountd/mountd.c
+++ b/utils/mountd/mountd.c
@@ -24,14 +24,22 @@
 #include "mountd.h"
 #include "rpcmisc.h"
 
+extern void	cache_open(void);
+extern struct nfs_fh_len *cache_get_filehandle(nfs_export *exp, int len);
+extern void cache_export(nfs_export *exp);
+
+extern void my_svc_run(void);
+
 static void		usage(const char *, int exitcode);
 static exports		get_exportlist(void);
 static struct nfs_fh_len *get_rootfh(struct svc_req *, dirpath *, int *, int v3);
 
+int new_cache = 0;
+
 static struct option longopts[] =
 {
 	{ "foreground", 0, 0, 'F' },
-	{ "descriptors", 0, 0, 'o' },
+	{ "descriptors", 1, 0, 'o' },
 	{ "debug", 1, 0, 'd' },
 	{ "help", 0, 0, 'h' },
 	{ "exports-file", 1, 0, 'f' },
@@ -182,7 +190,7 @@ mount_pathconf_2_svc(struct svc_req *rqstp, dirpath *path, ppathcnf *res)
 	}
 
 	/* Now authenticate the intruder... */
-	if (!(exp = auth_authenticate("mount", sin, p))) {
+	if (!(exp = auth_authenticate("pathconf", sin, p))) {
 		return 1;
 	} else if (stat(p, &stb) < 0) {
 		xlog(L_WARNING, "can't stat exported dir %s: %s",
@@ -264,6 +272,20 @@ get_rootfh(struct svc_req *rqstp, dirpath *path, int *error, int v3)
 	} else if (!S_ISDIR(stb.st_mode) && !S_ISREG(stb.st_mode)) {
 		xlog(L_WARNING, "%s is not a directory or regular file", p);
 		*error = NFSERR_NOTDIR;
+	} 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,
+		 * 
+		 */
+		struct nfs_fh_len  *fh;
+
+		cache_export(exp);
+		fh = cache_get_filehandle(exp, v3?64:32);
+		if (fh == NULL) 
+			*error = NFSERR_ACCES;
+		else
+			*error = NFS_OK;
+		return fh;
 	} else {
 		struct nfs_fh_len  *fh;
 
@@ -399,7 +421,7 @@ main(int argc, char **argv)
 
 	/* Parse the command line options and arguments. */
 	opterr = 0;
-	while ((c = getopt_long(argc, argv, "o:Fd:f:p:P:hN:V:v", longopts, NULL)) != EOF)
+	while ((c = getopt_long(argc, argv, "on:Fd:f:p:P:hN:V:v", longopts, NULL)) != EOF)
 		switch (c) {
 		case 'o':
 			descriptors = atoi(optarg);
@@ -484,6 +506,17 @@ main(int argc, char **argv)
 	/* WARNING: the following works on Linux and SysV, but not BSD! */
 	sigaction(SIGCHLD, &sa, NULL);
 
+	/* Daemons should close all extra filehandles ... *before* RPC init. */
+	if (!foreground) {
+		int fd = sysconf (_SC_OPEN_MAX);
+		while (--fd > 2)
+			(void) close(fd);
+	}
+
+	new_cache = check_new_cache();
+	if (new_cache)
+		cache_open();
+
 	if (nfs_version & 0x1)
 		rpc_init("mountd", MOUNTPROG, MOUNTVERS,
 			 mount_dispatch, port);
@@ -522,7 +555,7 @@ main(int argc, char **argv)
 		xlog_background();
 	}
 
-	svc_run();
+	my_svc_run();
 
 	xlog(L_ERROR, "Ack! Gack! svc_run returned!\n");
 	exit(1);