statd: Replace note() with xlog() in rpc.statd

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

diff --git a/utils/mountd/rmtab.c b/utils/mountd/rmtab.c
index f641a96aa42e0eea05deaf20e9067cee5fdd1005..c371f8db8bef27bd8d9dd5e98807d026e754122d 100644 (file)
--- a/utils/mountd/rmtab.c
+++ b/utils/mountd/rmtab.c
@@ -25,6 +25,8 @@
 
 #include <limits.h> /* PATH_MAX */
 
+extern int reverse_resolve;
+
 /* If new path is a link do not destroy it but place the
  * file where the link points.
  */
@@ -56,7 +58,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) {
@@ -96,7 +98,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);
@@ -137,7 +139,7 @@ mountlist_del_all(struct sockaddr_in *sin)
        FILE            *fp;
        int             lockid;
 
-       if ((lockid = xflock(_PATH_RMTAB, "w")) < 0)
+       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));
@@ -160,10 +162,8 @@ mountlist_del_all(struct sockaddr_in *sin)
        }
        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);
+                   (exp = auth_authenticate("umountall", sin, rep->r_path)))
                        continue;
-               }
                fputrmtabent(fp, rep, NULL);
        }
        if (slink_safe_rename(_PATH_RMTABTMP, _PATH_RMTAB) < 0) {
@@ -185,8 +185,10 @@ mountlist_list(void)
        struct rmtabent         *rep;
        struct stat             stb;
        int                     lockid;
+       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);
@@ -204,8 +206,15 @@ mountlist_list(void)
                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);
+
+                       if (reverse_resolve &&
+                          inet_aton((const char *) rep->r_client, &addr) &&
+                          (he = gethostbyaddr(&addr, sizeof(addr), AF_INET)))
+                               m->ml_hostname = xstrdup(he->h_name);
+                       else
+                               m->ml_hostname = xstrdup(rep->r_client);
+
+                       m->ml_directory = xstrdup(rep->r_path);
                        m->ml_next = mlist;
                        mlist = m;
                }