* utils/mountd/auth.c (auth_authenticate_internal): Reverse

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

diff --git a/utils/mountd/auth.c b/utils/mountd/auth.c
index 49567c93158b384a592ebed479a689c733dea593..d88c46f31b52563827aac1aedfe5703e7fbc182f 100644 (file)
--- a/utils/mountd/auth.c
+++ b/utils/mountd/auth.c
@@ -78,24 +78,16 @@ auth_authenticate_internal(char *what, struct sockaddr_in *caller,
        }
        auth_fixpath(path);
 
-       /* 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;
-               return NULL;
-           } else {
+       if (!(*hpp = gethostbyaddr((const char *)&addr, sizeof(addr), AF_INET)))
+               *hpp = get_hostent((const char *)&addr, sizeof(addr),
+                                  AF_INET);
+       else {
                /* must make sure the hostent is authorative. */
                char **sp;
                struct hostent *forward = NULL;
                char *tmpname;
 
+               *hpp = hostent_dup (*hpp);
                tmpname = xstrdup((*hpp)->h_name);
                if (tmpname) {
                        forward = gethostbyname(tmpname);
@@ -111,25 +103,22 @@ 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;
@@ -157,7 +146,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';