Remove **/Makefile.in, aclocal.m4, configure, and

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

diff --git a/utils/mountd/auth.c b/utils/mountd/auth.c
index e92138918d4b36b91201628f3e1ed884c9954910..44d998016559c30057e6166a2b67267a69c9c9c6 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;
 
@@ -55,6 +59,7 @@ auth_reload()
        last_modified = stb.st_mtime;
 
        export_freeall();
+       memset(&my_client, 0, sizeof(my_client));
        // export_read(export_file);
        xtab_export_read();
 
@@ -69,8 +74,6 @@ 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 ||
@@ -80,6 +83,7 @@ auth_authenticate_internal(char *what, struct sockaddr_in *caller,
                        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");
@@ -114,13 +118,12 @@ auth_authenticate_internal(char *what, struct sockaddr_in *caller,
                        *error = not_exported;
                        return NULL;
                }
-
-               if (!(exp->m_export.e_flags & NFSEXP_INSECURE_PORT) &&
+       }
+       if (!(exp->m_export.e_flags & NFSEXP_INSECURE_PORT) &&
                    (ntohs(caller->sin_port) <  IPPORT_RESERVED/2 ||
                     ntohs(caller->sin_port) >= IPPORT_RESERVED)) {
-                       *error = illegal_port;
-                       return NULL;
-               }
+               *error = illegal_port;
+               return NULL;
        }
        *error = success;
 
@@ -167,7 +170,6 @@ auth_authenticate(char *what, struct sockaddr_in *caller, char *path)
                if (p == epath) p++;
                *p = '\0';
        }
-       free(hp);
 
        switch (error) {
        case bad_path: