mountd: Add mountlist_freeall()

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

diff --git a/utils/mountd/rmtab.c b/utils/mountd/rmtab.c
index b028529f4b274e9f2fcfa5f61b70110934483680..854d519808dd23f7861b4623b3407ae6b55a99bd 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;
 
@@ -130,22 +131,22 @@ 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_RMTABLCK, "w")) < 0)
                return;
-       if (!(hp = gethostbyaddr((char *)&addr, sizeof(addr), AF_INET))) {
-               xlog(L_ERROR, "can't get hostname of %s", inet_ntoa(addr));
+       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;
        }
-       hp = hostent_dup (hp);
 
        if (!setrmtabent("r"))
                goto out_free;
@@ -154,8 +155,8 @@ mountlist_del_all(struct sockaddr_in *sin)
                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);
        }
@@ -167,11 +168,23 @@ mountlist_del_all(struct sockaddr_in *sin)
 out_close:
        endrmtabent();  /* close & unlink */
 out_free:
-       free (hp);
+       free(hostname);
 out_unlock:
        xfunlock(lockid);
 }
 
+static void
+mountlist_freeall(mountlist list)
+{
+       while (list != NULL) {
+               mountlist m = list;
+               list = m->ml_next;
+               xfree(m->ml_hostname);
+               xfree(m->ml_directory);
+               xfree(m);
+       }
+}
+
 mountlist
 mountlist_list(void)
 {
@@ -187,16 +200,13 @@ mountlist_list(void)
        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");