Imported Upstream version 1.2.3

[nfs-utils.git] / utils / mountd / rmtab.c

diff --git a/utils/mountd/rmtab.c b/utils/mountd/rmtab.c
index 90fbef4702eede421b96e0e46ebe35aaf3c8037c..d3392968ab6b4c18b3422f9f7edf6c693b17d9c0 100644 (file)
--- a/utils/mountd/rmtab.c
+++ b/utils/mountd/rmtab.c
@@ -6,7 +6,9 @@
  * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -14,7 +16,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
-#include "xmalloc.h"
+
 #include "misc.h"
 #include "exportfs.h"
 #include "xio.h"
@@ -22,6 +24,9 @@
 #include "ha-callout.h"
 
 #include <limits.h> /* PATH_MAX */
+#include <errno.h>
+
+extern int reverse_resolve;
 
 /* If new path is a link do not destroy it but place the
  * file where the link points.
@@ -54,7 +59,7 @@ mountlist_add(char *host, const char *path)
        int             lockid;
        long            pos;
 
-       if ((lockid = xflock(_PATH_RMTAB, "a")) < 0)
+       if ((lockid = xflock(_PATH_RMTABLCK, "a")) < 0)
                return;
        setrmtabent("r+");
        while ((rep = getrmtabent(1, &pos)) != NULL) {
@@ -94,7 +99,7 @@ mountlist_del(char *hname, const char *path)
        int             lockid;
        int             match;
 
-       if ((lockid = xflock(_PATH_RMTAB, "w")) < 0)
+       if ((lockid = xflock(_PATH_RMTABLCK, "w")) < 0)
                return;
        if (!setrmtabent("r")) {
                xfunlock(lockid);
@@ -126,52 +131,58 @@ mountlist_del(char *hname, const char *path)
 }
 
 void
-mountlist_del_all(struct sockaddr_in *sin)
+mountlist_del_all(const struct sockaddr *sap)
 {
-       struct in_addr  addr = sin->sin_addr;
-       struct hostent  *hp;
+       char            *hostname;
        struct rmtabent *rep;
-       nfs_export      *exp;
        FILE            *fp;
        int             lockid;
 
-       if ((lockid = xflock(_PATH_RMTAB, "w")) < 0)
-               return;
-       if (!(hp = gethostbyaddr((char *)&addr, sizeof(addr), AF_INET))) {
-               xlog(L_ERROR, "can't get hostname of %s", inet_ntoa(addr));
-               xfunlock(lockid);
+       if ((lockid = xflock(_PATH_RMTABLCK, "w")) < 0)
                return;
+       hostname = host_canonname(sap);
+       if (hostname == NULL) {
+               char buf[INET6_ADDRSTRLEN];
+               xlog(L_ERROR, "can't get hostname of %s",
+                       host_ntop(sap, buf, sizeof(buf)));
+               goto out_unlock;
        }
-       else
-               hp = hostent_dup (hp);
 
-       if (!setrmtabent("r")) {
-               xfunlock(lockid);
-               free (hp);
-               return;
-       }
-       if (!(fp = fsetrmtabent(_PATH_RMTABTMP, "w"))) {
-               endrmtabent();
-               xfunlock(lockid);
-               free (hp);
-               return;
-       }
+       if (!setrmtabent("r"))
+               goto out_free;
+
+       if (!(fp = fsetrmtabent(_PATH_RMTABTMP, "w")))
+               goto out_close;
+
        while ((rep = getrmtabent(1, NULL)) != NULL) {
-               if (strcmp(rep->r_client, hp->h_name) == 0 &&
-                   (exp = auth_authenticate("umountall", sin, rep->r_path))) {
-                       export_reset(exp);
+               if (strcmp(rep->r_client, hostname) == 0 &&
+                   auth_authenticate("umountall", sap, rep->r_path) != NULL)
                        continue;
-               }
                fputrmtabent(fp, rep, NULL);
        }
        if (slink_safe_rename(_PATH_RMTABTMP, _PATH_RMTAB) < 0) {
                xlog(L_ERROR, "couldn't rename %s to %s",
                                _PATH_RMTABTMP, _PATH_RMTAB);
        }
-       endrmtabent();  /* close & unlink */
        fendrmtabent(fp);
+out_close:
+       endrmtabent();  /* close & unlink */
+out_free:
+       free(hostname);
+out_unlock:
        xfunlock(lockid);
-       free (hp);
+}
+
+static void
+mountlist_freeall(mountlist list)
+{
+       while (list != NULL) {
+               mountlist m = list;
+               list = m->ml_next;
+               free(m->ml_hostname);
+               free(m->ml_directory);
+               free(m);
+       }
 }
 
 mountlist
@@ -184,26 +195,50 @@ mountlist_list(void)
        struct stat             stb;
        int                     lockid;
 
-       if ((lockid = xflock(_PATH_RMTAB, "r")) < 0)
+       if ((lockid = xflock(_PATH_RMTABLCK, "r")) < 0)
                return NULL;
        if (stat(_PATH_RMTAB, &stb) < 0) {
-               xlog(L_ERROR, "can't stat %s", _PATH_RMTAB);
+               xlog(L_ERROR, "can't stat %s: %s",
+                               _PATH_RMTAB, strerror(errno));
+               xfunlock(lockid);
                return NULL;
        }
        if (stb.st_mtime != last_mtime) {
-               while (mlist) {
-                       mlist = (m = mlist)->ml_next;
-                       xfree(m->ml_hostname);
-                       xfree(m->ml_directory);
-                       xfree(m);
-               }
+               mountlist_freeall(mlist);
                last_mtime = stb.st_mtime;
 
                setrmtabent("r");
                while ((rep = getrmtabent(1, NULL)) != NULL) {
-                       m = (mountlist) xmalloc(sizeof(*m));
-                       m->ml_hostname = xstrdup(rep->r_client);
-                       m->ml_directory = xstrdup(rep->r_path);
+                       m = calloc(1, sizeof(*m));
+                       if (m == NULL) {
+                               mountlist_freeall(mlist);
+                               mlist = NULL;
+                               xlog(L_ERROR, "%s: memory allocation failed",
+                                               __func__);
+                               break;
+                       }
+
+                       if (reverse_resolve) {
+                               struct addrinfo *ai;
+                               ai = host_pton(rep->r_client);
+                               if (ai != NULL) {
+                                       m->ml_hostname = host_canonname(ai->ai_addr);
+                                       freeaddrinfo(ai);
+                               }
+                       }
+                       if (m->ml_hostname == NULL)
+                               m->ml_hostname = strdup(rep->r_client);
+
+                       m->ml_directory = strdup(rep->r_path);
+
+                       if (m->ml_hostname == NULL || m->ml_directory == NULL) {
+                               mountlist_freeall(mlist);
+                               mlist = NULL;
+                               xlog(L_ERROR, "%s: memory allocation failed",
+                                               __func__);
+                               break;
+                       }
+
                        m->ml_next = mlist;
                        mlist = m;
                }