rpc.mountd: create client_resolve and change client_compose to take a hostent arg

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

diff --git a/utils/mountd/auth.c b/utils/mountd/auth.c
index f968b07f906317642a4d438e8b40f7f8b653ee22..84fea30d8415f85e55568e442c78e4a011a372f6 100644 (file)
--- a/utils/mountd/auth.c
+++ b/utils/mountd/auth.c
@@ -6,12 +6,15 @@
  * Copyright (C) 1995, 1996 Olaf Kirch <okir@monad.swb.de>
  */
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 
 #include <sys/stat.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <errno.h>
+#include <unistd.h>
 #include "misc.h"
 #include "nfslib.h"
 #include "exportfs.h"
@@ -30,6 +33,8 @@ enum auth_error
 
 static void            auth_fixpath(char *path);
 static char    *export_file = NULL;
+static nfs_export my_exp;
+static nfs_client my_client;
 
 extern int new_cache;
 
@@ -42,23 +47,34 @@ auth_init(char *exports)
        xtab_mount_write();
 }
 
-int
+unsigned int
 auth_reload()
 {
        struct stat             stb;
-       static time_t           last_modified = 0;
-
-       if (stat(_PATH_ETAB, &stb) < 0)
+       static ino_t            last_inode;
+       static int              last_fd;
+       static unsigned int     counter;
+       int                     fd;
+
+       if ((fd = open(_PATH_ETAB, O_RDONLY)) < 0) {
+               xlog(L_FATAL, "couldn't open %s", _PATH_ETAB);
+       } else if (fstat(fd, &stb) < 0) {
                xlog(L_FATAL, "couldn't stat %s", _PATH_ETAB);
-       if (stb.st_mtime == last_modified)
-               return 0;
-       last_modified = stb.st_mtime;
+       } else if (stb.st_ino == last_inode) {
+               close(fd);
+               return counter;
+       } else {
+               close(last_fd);
+               last_fd = fd;
+               last_inode = stb.st_ino;
+       }
 
        export_freeall();
-       // export_read(export_file);
+       memset(&my_client, 0, sizeof(my_client));
        xtab_export_read();
+       ++counter;
 
-       return 1;
+       return counter;
 }
 
 static nfs_export *
@@ -69,24 +85,22 @@ auth_authenticate_internal(char *what, struct sockaddr_in *caller,
        nfs_export              *exp;
 
        if (new_cache) {
-               static nfs_export my_exp;
-               static nfs_client my_client;
                int i;
                /* return static nfs_export with details filled in */
-               if (my_client.m_naddr != 1 ||
-                   my_client.m_addrlist[0].s_addr != caller->sin_addr.s_addr) {
-                       /* different client to last time, so do a lookup */
-                       char *n;
-                       my_client.m_naddr = 0;
-                       my_client.m_addrlist[0] = caller->sin_addr;
-                       n = client_compose(caller->sin_addr);
-                       if (!n)
-                               return NULL;
-                       strcpy(my_client.m_hostname, *n?n:"DEFAULT");
+               char *n;
+               my_client.m_addrlist[0] = caller->sin_addr;
+               n = client_compose(hp);
+               *error = unknown_host;
+               if (!n)
+                       return NULL;
+               free(my_client.m_hostname);
+               if (*n) {
+                       my_client.m_hostname = n;
+               } else {
                        free(n);
-                       my_client.m_naddr = 1;
+                       my_client.m_hostname = xstrdup("DEFAULT");
                }
-
+               my_client.m_naddr = 1;
                my_exp.m_client = &my_client;
 
                exp = NULL;
@@ -146,11 +160,7 @@ auth_authenticate(char *what, struct sockaddr_in *caller, char *path)
        epath[sizeof (epath) - 1] = '\0';
        auth_fixpath(epath); /* strip duplicate '/' etc */
 
-       hp = get_reliable_hostbyaddr((const char*)&caller->sin_addr, sizeof(struct in_addr),
-                                    AF_INET);
-       if (!hp)
-               hp = get_hostent((const char*)&caller->sin_addr, sizeof(struct in_addr),
-                                    AF_INET);
+       hp = client_resolve(caller->sin_addr);
        if (!hp)
                return exp;
 
@@ -166,7 +176,6 @@ auth_authenticate(char *what, struct sockaddr_in *caller, char *path)
                if (p == epath) p++;
                *p = '\0';
        }
-       free(hp);
 
        switch (error) {
        case bad_path: