2000-11-27 Tobias Ringstrom <tori@tellus.mine.nu>

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

diff --git a/utils/mountd/auth.c b/utils/mountd/auth.c
index afa2292888088afdd572661ce9b65d5c6e21f1c0..6b6b7d74cf4fb1afe788b5055e303dde627f54a8 100644 (file)
--- a/utils/mountd/auth.c
+++ b/utils/mountd/auth.c
@@ -16,6 +16,7 @@
 #include "nfslib.h"
 #include "exportfs.h"
 #include "mountd.h"
+#include "xmalloc.h"
 
 enum auth_error
 {
@@ -77,15 +78,31 @@ auth_authenticate_internal(char *what, struct sockaddr_in *caller,
        }
        auth_fixpath(path);
 
-       if (!(*hpp = gethostbyaddr((const char *)&addr, sizeof(addr), AF_INET)))
-               *hpp = get_hostent((const char *)&addr, sizeof(addr),
-                                  AF_INET);
-       else {
+       /* First try it w/o doing a hostname lookup... */
+       *hpp = get_hostent((const char *)&addr, sizeof(addr), AF_INET);
+       exp = export_find(*hpp, path);
+
+       if (!exp) {
+           /* Ok, that didn't fly.  Try it with a reverse lookup. */
+           free (*hpp);
+           *hpp = gethostbyaddr((const char *)&addr, sizeof(addr),
+                                AF_INET);
+           if (!(*hpp)) {
+               *error = no_entry;
+               *hpp = get_hostent((const char *)&addr, sizeof(addr), AF_INET);
+               return NULL;
+           } else {
                /* must make sure the hostent is authorative. */
                char **sp;
-               struct hostent *forward;
-
-               forward = gethostbyname((*hpp)->h_name);
+               struct hostent *forward = NULL;
+               char *tmpname;
+
+               *hpp = hostent_dup (*hpp);
+               tmpname = xstrdup((*hpp)->h_name);
+               if (tmpname) {
+                       forward = gethostbyname(tmpname);
+                       free(tmpname);
+               }
                if (forward) {
                        /* now make sure the "addr" is in the list */
                        for (sp = forward->h_addr_list ; *sp ; sp++) {
@@ -96,23 +113,24 @@ auth_authenticate_internal(char *what, struct sockaddr_in *caller,
                        if (!*sp) {
                                /* it was a FAKE */
                                *error = faked_hostent;
-                               *hpp = hostent_dup (*hpp);
                                return NULL;
                        }
+                       free (*hpp);
                        *hpp = hostent_dup (forward);
                }
                else {
                        /* never heard of it. misconfigured DNS? */
                        *error = no_forward_dns;
-                       *hpp = hostent_dup (*hpp);
                        return NULL;
                }
-       }
+           }
 
-       if (!(exp = export_find(*hpp, path))) {
+           if (!(exp = export_find(*hpp, path))) {
                *error = no_entry;
                return NULL;
+           }
        }
+
        if (!exp->m_mayexport) {
                *error = not_exported;
                return NULL;
@@ -140,7 +158,11 @@ auth_authenticate(char *what, struct sockaddr_in *caller, char *path)
        struct in_addr  addr = caller->sin_addr;
        enum auth_error error;
 
-       if (path [0] != '/') return exp;
+       if (path [0] != '/') {
+               xlog(L_WARNING, "bad path in %s request from %s: \"%s\"",
+                    what, inet_ntoa(addr), path);
+               return exp;
+       }
 
        strncpy(epath, path, sizeof (epath) - 1);
        epath[sizeof (epath) - 1] = '\0';