Extend the exportfs interface to pass fslocations info into the kernel.

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

diff --git a/utils/mountd/rmtab.c b/utils/mountd/rmtab.c
index 844de511f48b07d76baac5b0b828b9e5520af33f..e8aff5ae3d0fed5f6d0b183a931c766a8b104f66 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>
@@ -19,9 +21,12 @@
 #include "exportfs.h"
 #include "xio.h"
 #include "mountd.h"
+#include "ha-callout.h"
 
 #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.
  */
@@ -61,6 +66,8 @@ mountlist_add(char *host, const char *path)
                            host) == 0
                    && strcmp(rep->r_path, path) == 0) {
                        rep->r_count++;
+                       /* PRC: do the HA callout: */
+                       ha_callout("mount", rep->r_client, rep->r_path, rep->r_count);
                        putrmtabent(rep, &pos);
                        endrmtabent();
                        xfunlock(lockid);
@@ -75,6 +82,8 @@ mountlist_add(char *host, const char *path)
        xe.r_path [sizeof (xe.r_path) - 1] = '\0';
        xe.r_count = 1;
        if (setrmtabent("a")) {
+               /* PRC: do the HA callout: */
+               ha_callout("mount", xe.r_client, xe.r_path, xe.r_count);
                putrmtabent(&xe, NULL);
                endrmtabent();
        }
@@ -103,8 +112,11 @@ mountlist_del(char *hname, const char *path)
        while ((rep = getrmtabent(1, NULL)) != NULL) {
                match = !strcmp (rep->r_client, hname)
                        && !strcmp(rep->r_path, path);
-               if (match)
+               if (match) {
                        rep->r_count--;
+                       /* PRC: do the HA callout: */
+                       ha_callout("unmount", rep->r_client, rep->r_path, rep->r_count);
+               }
                if (!match || rep->r_count)
                        fputrmtabent(fp, rep, NULL);
        }
@@ -175,6 +187,8 @@ 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)
                return NULL;
@@ -194,8 +208,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;
                }