Merge branch 'upstream'

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

diff --git a/utils/mountd/auth.c b/utils/mountd/auth.c
index 4e1cdbd800527e40825f534781227d0867dfd0c6..4f803d7aa0511bac1e9c9fc163ee278dca25220d 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>
@@ -74,21 +76,15 @@ auth_authenticate_internal(char *what, struct sockaddr_in *caller,
        if (new_cache) {
                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);
-                       *error = unknown_host;
-                       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;