nfsidmap: Added Error Logging

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

diff --git a/utils/exportfs/exportfs.c b/utils/exportfs/exportfs.c
index b78957f249f44ae6c2226984e241ed6a2eb0fded..7432a6592c8d0e69c60dfc69ececec56e92b1f34 100644 (file)
--- a/utils/exportfs/exportfs.c
+++ b/utils/exportfs/exportfs.c
@@ -25,6 +25,7 @@
 #include <fcntl.h>
 #include <netdb.h>
 #include <errno.h>
+#include <dirent.h>
 
 #include "sockaddr.h"
 #include "misc.h"
@@ -41,6 +42,7 @@ static void   error(nfs_export *exp, int err);
 static void    usage(const char *progname);
 static void    validate_export(nfs_export *exp);
 static int     matchhostname(const char *hostname1, const char *hostname2);
+static void    export_d_read(const char *dname);
 
 int
 main(int argc, char **argv)
@@ -127,8 +129,10 @@ main(int argc, char **argv)
                        return 0;
                }
        }
-       if (f_export && ! f_ignore)
+       if (f_export && ! f_ignore) {
                export_read(_PATH_EXPORTS);
+               export_d_read(_PATH_EXPORTS_D);
+       }
        if (f_export) {
                if (f_all)
                        export_all(f_verbose);
@@ -246,7 +250,7 @@ static void
 exportfs(char *arg, char *options, int verbose)
 {
        struct exportent *eep;
-       nfs_export      *exp;
+       nfs_export      *exp = NULL;
        struct addrinfo *ai = NULL;
        char            *path;
        char            *hname = arg;
@@ -397,7 +401,7 @@ validate_export(nfs_export *exp)
        int fs_has_fsid = 0;
 
        if (stat(path, &stb) < 0) {
-               xlog(L_ERROR, "Failed to stat %s: %m \n", path);
+               xlog(L_ERROR, "Failed to stat %s: %m", path);
                return;
        }
        if (!S_ISDIR(stb.st_mode) && !S_ISREG(stb.st_mode)) {
@@ -444,6 +448,36 @@ is_hostname(const char *sp)
        return true;
 }
 
+/*
+ * Take care to perform an explicit reverse lookup on presentation
+ * addresses.  Otherwise we don't get a real canonical name or a
+ * complete list of addresses.
+ */
+static struct addrinfo *
+address_list(const char *hostname)
+{
+       struct addrinfo *ai;
+       char *cname;
+
+       ai = host_pton(hostname);
+       if (ai != NULL) {
+               /* @hostname was a presentation address */
+               cname = host_canonname(ai->ai_addr);
+               freeaddrinfo(ai);
+               if (cname != NULL)
+                       goto out;
+       }
+       /* @hostname was a hostname or had no reverse mapping */
+       cname = strdup(hostname);
+       if (cname == NULL)
+               return NULL;
+
+out:
+       ai = host_addrinfo(cname);
+       free(cname);
+       return ai;
+}
+
 static int
 matchhostname(const char *hostname1, const char *hostname2)
 {
@@ -460,10 +494,10 @@ matchhostname(const char *hostname1, const char *hostname2)
        if (!is_hostname(hostname1) || !is_hostname(hostname2))
                return 0;
 
-       results1 = host_addrinfo(hostname1);
+       results1 = address_list(hostname1);
        if (results1 == NULL)
                goto out;
-       results2 = host_addrinfo(hostname2);
+       results2 = address_list(hostname2);
        if (results2 == NULL)
                goto out;
 
@@ -485,6 +519,62 @@ out:
        return result;
 }
 
+/* Based on mnt_table_parse_dir() in
+   util-linux-ng/shlibs/mount/src/tab_parse.c */
+static void
+export_d_read(const char *dname)
+{
+       int n = 0, i;
+       struct dirent **namelist = NULL;
+
+
+       n = scandir(dname, &namelist, NULL, versionsort);
+       if (n < 0) {
+               if (errno == ENOENT)
+                       /* Silently return */
+                       return;
+               xlog(L_NOTICE, "scandir %s: %s", dname, strerror(errno));
+       } else if (n == 0)
+               return;
+
+       for (i = 0; i < n; i++) {
+               struct dirent *d = namelist[i];
+               size_t namesz;
+               char fname[PATH_MAX + 1];
+               int fname_len;
+
+
+               if (d->d_type != DT_UNKNOWN 
+                   && d->d_type != DT_REG
+                   && d->d_type != DT_LNK)
+                       continue;
+               if (*d->d_name == '.')
+                       continue;
+
+#define _EXT_EXPORT_SIZ   (sizeof(_EXT_EXPORT) - 1)
+               namesz = strlen(d->d_name);
+               if (!namesz 
+                   || namesz < _EXT_EXPORT_SIZ + 1
+                   || strcmp(d->d_name + (namesz - _EXT_EXPORT_SIZ),
+                             _EXT_EXPORT))
+                       continue;
+
+               fname_len = snprintf(fname, PATH_MAX +1, "%s/%s", dname, d->d_name);
+               if (fname_len > PATH_MAX) {
+                       xlog(L_WARNING, "Too long file name: %s in %s", d->d_name, dname);
+                       continue;
+               }
+
+               export_read(fname);
+       }
+               
+       for (i = 0; i < n; i++)
+               free(namelist[i]);
+       free(namelist);
+
+       return;
+}
+
 static char
 dumpopt(char c, char *fmt, ...)
 {
@@ -585,7 +675,7 @@ dump(int verbose)
 static void
 error(nfs_export *exp, int err)
 {
-       xlog(L_ERROR, "%s:%s: %s\n", exp->m_client->m_hostname,
+       xlog(L_ERROR, "%s:%s: %s", exp->m_client->m_hostname,
                exp->m_export.e_path, strerror(err));
 }