X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=utils%2Fmountd%2Fcache.c;h=77029f446bff8fd33957613bbe116869148583a4;hb=e873a11144f5cbfa6b54a3b2eb3af131cbd5ebbd;hp=96492b8f5b467ec55ddc408eeb798339a8ce47f0;hpb=e09fbc8933961a0a774217ef32d73da373ddc670;p=nfs-utils.git

diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
index 96492b8..77029f4 100644
--- a/utils/mountd/cache.c
+++ b/utils/mountd/cache.c
@@ -67,6 +67,8 @@ void auth_unix_ip(FILE *f)
 	if (inet_aton(ipaddr, &addr)==0)
 		return;
 
+	auth_reload();
+
 	/* addr is a valid, interesting address, find the domain name... */
 	client = client_compose(addr);
 
@@ -138,6 +140,8 @@ void nfsd_fh(FILE *f)
 		break;
 	}
 
+	auth_reload();
+
 	/* Now determine export point for this fsid/domain */
 	for (i=0 ; i < MCL_MAXTYPES; i++) {
 		for (exp = exportlist[i]; exp; exp = exp->m_next) {
@@ -236,6 +240,8 @@ void nfsd_export(FILE *f)
 	if (qword_get(&cp, path, strlen(lbuf)) <= 0)
 		goto out;
 
+	auth_reload();
+
 	/* now find flags for this export point in this domain */
 	for (i=0 ; i < MCL_MAXTYPES; i++) {
 		for (exp = exportlist[i]; exp; exp = exp->m_next) {
@@ -309,6 +315,7 @@ int cache_process_req(fd_set *readfds)
 		    FD_ISSET(fileno(cachelist[i].f), readfds)) {
 			cnt++;
 			cachelist[i].cache_handle(cachelist[i].f);
+			FD_CLR(fileno(cachelist[i].f), readfds);
 		}
 	}
 	return cnt;
@@ -376,6 +383,7 @@ cache_get_filehandle(nfs_export *exp, int len, char *p)
 	FILE *f = fopen("/proc/fs/nfsd/filehandle", "r+");
 	char buf[200];
 	char *bp = buf;
+	int failed;
 	static struct nfs_fh_len fh;
 
 	if (!f)
@@ -388,7 +396,9 @@ cache_get_filehandle(nfs_export *exp, int len, char *p)
 	qword_printint(f, len);	
 	qword_eol(f);
 	
-	if (fgets(buf, sizeof(buf), f) == NULL)
+	failed = (fgets(buf, sizeof(buf), f) == NULL);
+	fclose(f);
+	if (failed)
 		return NULL;
 	memset(fh.fh_handle, 0, sizeof(fh.fh_handle));
 	fh.fh_size = qword_get(&bp, fh.fh_handle, NFS3_FHSIZE);