mountd: support IPv6 in mountlist_del_all()

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

diff --git a/utils/mountd/rmtab.c b/utils/mountd/rmtab.c
index 5787ed6a0bebacdc9f4bb270d933833e28f425bf..b2c04e769750d289a4fd8b2a929596e7e49ee0e5 100644 (file)
--- a/utils/mountd/rmtab.c
+++ b/utils/mountd/rmtab.c
@@ -24,6 +24,7 @@
 #include "ha-callout.h"
 
 #include <limits.h> /* PATH_MAX */
+#include <errno.h>
 
 extern int reverse_resolve;
 
@@ -58,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) {
@@ -98,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);
@@ -130,39 +131,32 @@ 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)))
+               if (strcmp(rep->r_client, hostname) == 0 &&
+                   auth_authenticate("umountall", sap, rep->r_path) != NULL)
                        continue;
                fputrmtabent(fp, rep, NULL);
        }
@@ -170,10 +164,13 @@ mountlist_del_all(struct sockaddr_in *sin)
                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);
 }
 
 mountlist
@@ -188,10 +185,12 @@ mountlist_list(void)
        struct in_addr          addr;
        struct hostent          *he;
 
-       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) {