#include "xmalloc.h"
#include "fsloc.h"
+#ifdef USE_BLKID
#include "blkid/blkid.h"
+#endif
enum nfsd_fsid {
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
}
return 1;
}
+#endif
/* Iterate through /etc/mtab, finding mountpoints
* at or below a given path
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:
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);
if (memcmp(u, fhuuid, uuidlen) != 0)
continue;
break;
+#else
+ continue;
+#endif
}
/* It's a match !! */
if (!found) {
}
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);
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)) {
qword_print(f, "uuid");
qword_printhex(f, exp->e_uuid, 16);
}
+#endif
}
return qword_eol(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);
}
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
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;