X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmountd%2Fcache.c;h=d0688432b04aa8de76f1f636e137eeb343ce98e5;hp=e8d72fa0beb1bd366ad213e07e17128ec8c401e9;hb=c57ae7ee252e665fcc515ae938f0e78ce1d736e9;hpb=8e64355493df4a0d2914b11a75ce80deeea27aca

diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
index e8d72fa..d068843 100644
--- a/utils/mountd/cache.c
+++ b/utils/mountd/cache.c
@@ -397,6 +397,9 @@ void nfsd_fh(FILE *f)
 				dev_missing ++;
 			if (stat(path, &stb) != 0)
 				continue;
+			if (!S_ISDIR(stb.st_mode) && !S_ISREG(stb.st_mode)) {
+				continue;
+			}
 			switch(fsidtype){
 			case FSID_DEV:
 			case FSID_MAJOR_MINOR:
@@ -469,7 +472,8 @@ void nfsd_fh(FILE *f)
 	}
 
 	if (found)
-		cache_export_ent(dom, found, found_path);
+		if (cache_export_ent(dom, found, found_path) < 0)
+			found = 0;
 
 	qword_print(f, dom);
 	qword_printint(f, fsidtype);
@@ -619,8 +623,13 @@ void nfsd_export(FILE *f)
 	}
 
 	if (found) {
-		dump_to_cache(f, dom, path, &found->m_export);
-		mountlist_add(dom, path);
+		if (dump_to_cache(f, dom, path, &found->m_export) < 0) {
+			xlog(L_WARNING,
+			     "Cannot export %s, possibly unsupported filesystem"
+			     " or fsid= required", path);
+			dump_to_cache(f, dom, path, NULL);
+		} else
+			mountlist_add(dom, path);
 	} else {
 		dump_to_cache(f, dom, path, NULL);
 	}
@@ -694,9 +703,14 @@ int cache_export_ent(char *domain, struct exportent *exp, char *path)
 		return -1;
 
 	err = dump_to_cache(f, domain, exp->e_path, exp);
+	if (err) {
+		xlog(L_WARNING,
+		     "Cannot export %s, possibly unsupported filesystem or"
+		     " fsid= required", exp->e_path);
+	}
 	mountlist_add(domain, exp->e_path);
 
-	while ((exp->e_flags & NFSEXP_CROSSMOUNT) && path) {
+	while (err == 0 && (exp->e_flags & NFSEXP_CROSSMOUNT) && path) {
 		/* really an 'if', but we can break out of
 		 * a 'while' more easily */
 		/* Look along 'path' for other filesystems
@@ -714,16 +728,17 @@ int cache_export_ent(char *domain, struct exportent *exp, char *path)
 		dev = stb.st_dev;
 		while(path[l] == '/') {
 			char c;
-			int err;
+			/* errors for submount should fail whole filesystem */
+			int err2;
 
 			l++;
 			while (path[l] != '/' && path[l])
 				l++;
 			c = path[l];
 			path[l] = 0;
-			err = lstat(path, &stb);
+			err2 = lstat(path, &stb);
 			path[l] = c;
-			if (err < 0)
+			if (err2 < 0)
 				break;
 			if (stb.st_dev == dev)
 				continue;