Stop exportfs warning about needing fsid, when we actually have one

[nfs-utils.git] / utils / exportfs / exportfs.c

diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
index 22e13a35b9ac9675589fc62512a133d6d45fedc4..fec2571934b0a04e263f81dfa58985cd74fd7d54 100644 (file)
--- a/utils/exportfs/exportfs.c
+++ b/utils/exportfs/exportfs.c
@@ -12,6 +12,8 @@
 #include <config.h>
 #endif
 
+#include <sys/vfs.h>
+#include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
@@ -32,7 +34,7 @@ static void   exports_update(int verbose);
 static void    dump(int verbose);
 static void    error(nfs_export *exp, int err);
 static void    usage(void);
-
+static void    validate_export(nfs_export *exp);
 
 int
 main(int argc, char **argv)
@@ -218,6 +220,8 @@ export_all(int verbose)
                        exp->m_xtabent = 1;
                        exp->m_mayexport = 1;
                        exp->m_changed = 1;
+                       exp->m_warned = 0;
+                       validate_export(exp);
                }
        }
 }
@@ -274,6 +278,8 @@ exportfs(char *arg, char *options, int verbose)
        exp->m_xtabent = 1;
        exp->m_mayexport = 1;
        exp->m_changed = 1;
+       exp->m_warned = 0;
+       validate_export(exp);
        if (hp) free (hp);
 }
 
@@ -338,6 +344,94 @@ unexportfs(char *arg, int verbose)
        if (hp) free (hp);
 }
 
+static int can_test(void)
+{
+       int fd;
+       int n;
+       char *setup = "nfsd 0.0.0.0 2147483647 -test-client-\n";
+       fd = open("/proc/net/rpc/auth.unix.ip/channel", O_WRONLY);
+       if ( fd < 0) return 0;
+       n = write(fd, setup, strlen(setup));
+       close(fd);
+       if (n < 0)
+               return 0;
+       fd = open("/proc/net/rpc/nfsd.export/channel", O_WRONLY);
+       if ( fd < 0) return 0;
+       close(fd);
+       return 1;
+}
+
+static int test_export(char *path, int with_fsid)
+{
+       char buf[1024];
+       int fd, n;
+
+       sprintf(buf, "-test-client- %s 3 %d -1 -1 0\n",
+               path,
+               with_fsid ? NFSEXP_FSID : 0);
+       fd = open("/proc/net/rpc/nfsd.export/channel", O_WRONLY);
+       if (fd < 0)
+               return 0;
+       n = write(fd, buf, strlen(buf));
+       close(fd);
+       if (n < 0)
+               return 0;
+       return 1;
+}
+
+static void
+validate_export(nfs_export *exp)
+{
+       /* Check that the given export point is potentially exportable.
+        * We just give warnings here, don't cause anything to fail.
+        * If a path doesn't exist, or is not a dir or file, give an warning
+        * otherwise trial-export to '-test-client-' and check for failure.
+        */
+       struct stat stb;
+       char *path = exp->m_export.e_path;
+       struct statfs64 stf;
+       int fs_has_fsid = 0;
+
+       if (stat(path, &stb) < 0) {
+               fprintf(stderr, "exportfs: Warning: %s does not exist\n",
+                       path);
+               return;
+       }
+       if (!S_ISDIR(stb.st_mode) && !S_ISREG(stb.st_mode)) {
+               fprintf(stderr, "exportfs: Warning: %s is neither "
+                       "a directory nor a file.\n"
+                       "     remote access will fail\n", path);
+               return;
+       }
+       if (!can_test())
+               return;
+
+       if (!statfs64(path, &stf) &&
+           (stf.f_fsid.__val[0] || stf.f_fsid.__val[1]))
+               fs_has_fsid = 1;
+
+       if ((exp->m_export.e_flags & NFSEXP_FSID) || exp->m_export.e_uuid ||
+           fs_has_fsid) {
+               if ( !test_export(path, 1)) {
+                       fprintf(stderr, "exportfs: Warning: %s does not "
+                               "support NFS export.\n",
+                               path);
+                       return;
+               }
+       } else if ( ! test_export(path, 0)) {
+               if (test_export(path, 1))
+                       fprintf(stderr, "exportfs: Warning: %s requires fsid= "
+                               "for NFS export\n", path);
+               else
+                       fprintf(stderr, "exportfs: Warning: %s does not "
+                               "support NFS export.\n",
+                               path);
+               return;
+
+       }
+}
+
+
 static char
 dumpopt(char c, char *fmt, ...)
 {
@@ -410,10 +504,6 @@ dump(int verbose)
                                c = dumpopt(c, "mountpoint%s%s", 
                                            ep->e_mountpoint[0]?"=":"", 
                                            ep->e_mountpoint);
-                       if (ep->e_maptype == CLE_MAP_UGIDD)
-                               c = dumpopt(c, "mapping=ugidd");
-                       else if (ep->e_maptype == CLE_MAP_FILE)
-                               c = dumpopt(c, "mapping=file");
                        if (ep->e_anonuid != 65534)
                                c = dumpopt(c, "anonuid=%d", ep->e_anonuid);
                        if (ep->e_anongid != 65534)
@@ -433,6 +523,7 @@ dump(int verbose)
                                break;
 #endif
                        }
+                       secinfo_show(stdout, ep);
                        printf("%c\n", (c != '(')? ')' : ' ');
                }
        }