X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmountd%2Fmountd.c;h=6dbd224fc27af0e0422e0972d8ecf3599c415e0c;hp=ae5daa12fff4fc491c6707f74f6ed402f14fc595;hb=18fc7a86a2a1213762cc4107565903127efadafc;hpb=317522198e1493fe0f1b10614ff2f3a582a9aaff

diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c
index ae5daa1..6dbd224 100644
--- a/utils/mountd/mountd.c
+++ b/utils/mountd/mountd.c
@@ -117,8 +117,14 @@ mount_umnt_1_svc(struct svc_req *rqstp, dirpath *argp, void *resp)
 	if (!(exp = auth_authenticate("unmount", sin, p))) {
 		return 1;
 	}
-	mountlist_del(exp, p);
-	export_reset (exp);
+	if (new_cache) {
+		if (strcmp(inet_ntoa(exp->m_client->m_addrlist[0]), exp->m_client->m_hostname))
+			mountlist_del(inet_ntoa(exp->m_client->m_addrlist[0]), exp->m_client->m_hostname);
+		mountlist_del(exp->m_client->m_hostname, p);
+	} else {
+		mountlist_del(exp->m_client->m_hostname, p);
+		export_reset (exp);
+	}
 	return 1;
 }
 
@@ -322,7 +328,7 @@ get_rootfh(struct svc_req *rqstp, dirpath *path, int *error, int v3)
 						stb.st_dev, stb.st_ino);
 		}
 		if (fh != NULL) {
-			mountlist_add(exp, p);
+			mountlist_add(exp->m_client->m_hostname, p);
 			*error = NFS_OK;
 			export_reset (exp);
 			return fh;
@@ -431,7 +437,7 @@ 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;
@@ -498,19 +504,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"); */