If an attempt is made to export a non-(dir|file), just ignore it.
This should get caught by exportfs.
If an attempt is made to export a non-exportable filesystem, report
an error. Hopefully exportfs can trap some these as well, but
catching them in mountd as well is good.
Signed-off-by: Neil Brown <neilb@suse.de>
dev_missing ++;
if (stat(path, &stb) != 0)
continue;
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:
switch(fsidtype){
case FSID_DEV:
case FSID_MAJOR_MINOR:
- if (dump_to_cache(f, dom, path, &found->m_export) < 0)
+ 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);
dump_to_cache(f, dom, path, NULL);
mountlist_add(dom, path);
} else {
dump_to_cache(f, dom, path, NULL);
mountlist_add(dom, path);
} else {
dump_to_cache(f, dom, path, NULL);
return -1;
err = dump_to_cache(f, domain, exp->e_path, exp);
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);
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
/* 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;
dev = stb.st_dev;
while(path[l] == '/') {
char c;
+ /* errors for submount should fail whole filesystem */
+ int err2;
l++;
while (path[l] != '/' && path[l])
l++;
c = path[l];
path[l] = 0;
l++;
while (path[l] != '/' && path[l])
l++;
c = path[l];
path[l] = 0;
- err = lstat(path, &stb);
+ err2 = lstat(path, &stb);
break;
if (stb.st_dev == dev)
continue;
break;
if (stb.st_dev == dev)
continue;