X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmountd%2Fcache.c;h=d0688432b04aa8de76f1f636e137eeb343ce98e5;hp=734ddd8f5ea5d50d5493ec90c212462b5ef7480a;hb=a5f020dda1a93657eae1b297a67d054269a3ef0c;hpb=323d1c4d69b65ab36d951aca8473ceb02171ab08

diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
index 734ddd8..d068843 100644
--- a/utils/mountd/cache.c
+++ b/utils/mountd/cache.c
@@ -23,6 +23,7 @@
 #include <ctype.h>
 #include <pwd.h>
 #include <grp.h>
+#include <mntent.h>
 #include "misc.h"
 #include "nfslib.h"
 #include "exportfs.h"
@@ -30,7 +31,9 @@
 #include "xmalloc.h"
 #include "fsloc.h"
 
+#ifdef USE_BLKID
 #include "blkid/blkid.h"
+#endif
 
 
 enum nfsd_fsid {
@@ -151,6 +154,7 @@ void auth_unix_gid(FILE *f)
 		free(groups);
 }
 
+#if USE_BLKID
 int get_uuid(char *path, char *uuid, int uuidlen, char *u)
 {
 	/* extract hex digits from uuidstr and compose a uuid
@@ -215,7 +219,32 @@ int get_uuid(char *path, char *uuid, int uuidlen, char *u)
 	}
 	return 1;
 }
-	
+#endif
+
+/* Iterate through /etc/mtab, finding mountpoints
+ * at or below a given path
+ */
+static char *next_mnt(void **v, char *p)
+{
+	FILE *f;
+	struct mntent *me;
+	int l = strlen(p);
+	if (*v == NULL) {
+		f = setmntent("/etc/mtab", "r");
+		*v = f;
+	} else
+		f = *v;
+	while ((me = getmntent(f)) != NULL &&
+	       (strncmp(me->mnt_dir, p, l) != 0 ||
+		me->mnt_dir[l] != '/'))
+		;
+	if (me == NULL) {
+		endmntent(f);
+		*v = NULL;
+		return NULL;
+	}
+	return me->mnt_dir;
+}
 
 void nfsd_fh(FILE *f)
 {
@@ -234,6 +263,7 @@ void nfsd_fh(FILE *f)
 	unsigned int fsidnum=0;
 	char fsid[32];
 	struct exportent *found = NULL;
+	char *found_path = NULL;
 	nfs_export *exp;
 	int i;
 	int dev_missing = 0;
@@ -328,9 +358,35 @@ void nfsd_fh(FILE *f)
 
 	/* Now determine export point for this fsid/domain */
 	for (i=0 ; i < MCL_MAXTYPES; i++) {
-		for (exp = exportlist[i]; exp; exp = exp->m_next) {
+		nfs_export *next_exp;
+		for (exp = exportlist[i]; exp; exp = next_exp) {
 			struct stat stb;
-			char u[16];			
+			char u[16];
+			char *path;
+
+			if (exp->m_export.e_flags & NFSEXP_CROSSMOUNT) {
+				static nfs_export *prev = NULL;
+				static void *mnt = NULL;
+				
+				if (prev == exp) {
+					/* try a submount */
+					path = next_mnt(&mnt, exp->m_export.e_path);
+					if (!path) {
+						next_exp = exp->m_next;
+						prev = NULL;
+						continue;
+					}
+					next_exp = exp;
+				} else {
+					prev = exp;
+					mnt = NULL;
+					path = exp->m_export.e_path;
+					next_exp = exp;
+				}
+			} else {
+				path = exp->m_export.e_path;
+				next_exp = exp->m_next;
+			}
 
 			if (!client_member(dom, exp->m_client->m_hostname))
 				continue;
@@ -339,8 +395,11 @@ void nfsd_fh(FILE *f)
 					   exp->m_export.e_mountpoint:
 					   exp->m_export.e_path))
 				dev_missing ++;
-			if (stat(exp->m_export.e_path, &stb) != 0)
+			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:
@@ -363,27 +422,32 @@ void nfsd_fh(FILE *f)
 				goto check_uuid;
 			case FSID_UUID8:
 			case FSID_UUID16:
-				if (!is_mountpoint(exp->m_export.e_path))
+				if (!is_mountpoint(path))
 					continue;
 			check_uuid:
+#if USE_BLKID
 				if (exp->m_export.e_uuid)
 					get_uuid(NULL, exp->m_export.e_uuid,
 						 uuidlen, u);
-				else if (get_uuid(exp->m_export.e_path, NULL,
+				else if (get_uuid(path, NULL,
 						  uuidlen, u) == 0)
 					continue;
 
 				if (memcmp(u, fhuuid, uuidlen) != 0)
 					continue;
 				break;
+#else
+				continue;
+#endif
 			}
 			/* It's a match !! */
-			if (!found)
+			if (!found) {
 				found = &exp->m_export;
-			else if (strcmp(found->e_path, exp->m_export.e_path)!= 0)
+				found_path = strdup(path);
+			} else if (strcmp(found->e_path, exp->m_export.e_path)!= 0)
 			{
 				xlog(L_WARNING, "%s and %s have same filehandle for %s, using first",
-				     found->e_path, exp->m_export.e_path, dom);
+				     found_path, path, dom);
 			}
 		}
 	}
@@ -408,7 +472,8 @@ void nfsd_fh(FILE *f)
 	}
 
 	if (found)
-		cache_export_ent(dom, found, found->e_path);
+		if (cache_export_ent(dom, found, found_path) < 0)
+			found = 0;
 
 	qword_print(f, dom);
 	qword_printint(f, fsidtype);
@@ -464,6 +529,7 @@ static int dump_to_cache(FILE *f, char *domain, char *path, struct exportent *ex
 		qword_printint(f, exp->e_anongid);
 		qword_printint(f, exp->e_fsid);
 		write_fsloc(f, exp, path);
+#if USE_BLKID
  		if (exp->e_uuid == NULL) {
  			char u[16];
  			if (get_uuid(path, NULL, 16, u)) {
@@ -474,6 +540,7 @@ static int dump_to_cache(FILE *f, char *domain, char *path, struct exportent *ex
  			qword_print(f, "uuid");
  			qword_printhex(f, exp->e_uuid, 16);
  		}
+#endif
 	}
 	return qword_eol(f);
 }
@@ -515,11 +582,36 @@ void nfsd_export(FILE *f)
 		for (exp = exportlist[i]; exp; exp = exp->m_next) {
 			if (!client_member(dom, exp->m_client->m_hostname))
 				continue;
-			if (strcmp(path, exp->m_export.e_path))
+			if (exp->m_export.e_flags & NFSEXP_CROSSMOUNT) {
+				/* if path is a mountpoint below e_path, then OK */
+				int l = strlen(exp->m_export.e_path);
+				if (strcmp(path, exp->m_export.e_path) == 0 ||
+				    (strncmp(path, exp->m_export.e_path, l) == 0 &&
+				     path[l] == '/' &&
+				     is_mountpoint(path)))
+					/* ok */;
+				else
+					continue;
+			} else if (strcmp(path, exp->m_export.e_path) != 0)
 				continue;
 			if (!found) {
 				found = exp;
 				found_type = i;
+				continue;
+			}
+			/* If one is a CROSSMOUNT, then prefer the longest path */
+			if (((found->m_export.e_flags & NFSEXP_CROSSMOUNT) ||
+			     (found->m_export.e_flags & NFSEXP_CROSSMOUNT)) &&
+			    strlen(found->m_export.e_path) !=
+			    strlen(found->m_export.e_path)) {
+
+				if (strlen(exp->m_export.e_path) >
+				    strlen(found->m_export.e_path)) {
+					found = exp;
+					found_type = i;
+				}
+				continue;
+
 			} else if (found_type == i && found->m_warned == 0) {
 				xlog(L_WARNING, "%s exported to both %s and %s, "
 				     "arbitrarily choosing options from first",
@@ -531,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);
 	}
@@ -606,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
@@ -626,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;