From: hjl <hjl>
Date: Thu, 10 Aug 2000 03:02:40 +0000 (+0000)
Subject: 2000-08-02  H.J. Lu <hjl@lucon.org>
X-Git-Tag: nfs-utils-0-2-pre1~10
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=9b2a1e5430e9bcca39eddc25464234fd95d50b83;p=nfs-utils.git

2000-08-02  H.J. Lu <hjl@lucon.org>

	* utils/mountd/auth.c (auth_authenticate_internal): Try to
	avoid the reverse name lookup.
---

diff --git a/ChangeLog b/ChangeLog
index 44bef0a..b56dd18 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2000-08-02  H.J. Lu <hjl@lucon.org>
+
+	* utils/mountd/auth.c (auth_authenticate_internal): Try to
+	avoid the reverse name lookup.
+
 2000-07-04  H.J. Lu <hjl@lucon.org>
 
 	* utils/statd/log.c: Include <stdlib.h> for exit ().
diff --git a/utils/mountd/auth.c b/utils/mountd/auth.c
index 98c3944..49567c9 100644
--- a/utils/mountd/auth.c
+++ b/utils/mountd/auth.c
@@ -78,10 +78,19 @@ 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;
+		return NULL;
+	    } else {
 		/* must make sure the hostent is authorative. */
 		char **sp;
 		struct hostent *forward = NULL;
@@ -113,12 +122,14 @@ auth_authenticate_internal(char *what, struct sockaddr_in *caller,
 			*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;