update manpages for showmount and mountd

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

diff --git a/utils/mountd/auth.c b/utils/mountd/auth.c
index 6361fcebb13f6f1170c791ba9e65752e8416e5f6..183c9ea8c5b27b747925b832405333543eba97f0 100644 (file)
--- a/utils/mountd/auth.c
+++ b/utils/mountd/auth.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/stat.h>
 #include <netinet/in.h>
@@ -30,6 +32,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,7 +46,7 @@ auth_init(char *exports)
        xtab_mount_write();
 }
 
-int
+time_t
 auth_reload()
 {
        struct stat             stb;
@@ -51,14 +55,15 @@ auth_reload()
        if (stat(_PATH_ETAB, &stb) < 0)
                xlog(L_FATAL, "couldn't stat %s", _PATH_ETAB);
        if (stb.st_mtime == last_modified)
-               return 0;
+               return last_modified;
        last_modified = stb.st_mtime;
 
        export_freeall();
+       memset(&my_client, 0, sizeof(my_client));
        // export_read(export_file);
        xtab_export_read();
 
-       return 1;
+       return last_modified;
 }
 
 static nfs_export *
@@ -69,24 +74,17 @@ 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");
-                       free(n);
-                       my_client.m_naddr = 1;
-               }
-
+               char *n;
+               my_client.m_addrlist[0] = caller->sin_addr;
+               n = client_compose(caller->sin_addr);
+               *error = unknown_host;
+               if (!n)
+                       return NULL;
+               strcpy(my_client.m_hostname, *n?n:"DEFAULT");
+               free(n);
+               my_client.m_naddr = 1;
                my_exp.m_client = &my_client;
 
                exp = NULL;