X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=utils%2Fmountd%2Fauth.c;h=84fea30d8415f85e55568e442c78e4a011a372f6;hp=4f803d7aa0511bac1e9c9fc163ee278dca25220d;hb=180238a295c1a8127953c96f0b462688d0f57a09;hpb=865a1070166deac80930229cd97bb7f99482a340

diff --git a/utils/mountd/auth.c b/utils/mountd/auth.c
index 4f803d7..84fea30 100644
--- a/utils/mountd/auth.c
+++ b/utils/mountd/auth.c
@@ -14,6 +14,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <errno.h>
+#include <unistd.h>
 #include "misc.h"
 #include "nfslib.h"
 #include "exportfs.h"
@@ -46,24 +47,34 @@ auth_init(char *exports)
 	xtab_mount_write();
 }
 
-int
+unsigned int
 auth_reload()
 {
 	struct stat		stb;
-	static time_t		last_modified = 0;
-
-	if (stat(_PATH_ETAB, &stb) < 0)
+	static ino_t		last_inode;
+	static int		last_fd;
+	static unsigned int	counter;
+	int			fd;
+
+	if ((fd = open(_PATH_ETAB, O_RDONLY)) < 0) {
+		xlog(L_FATAL, "couldn't open %s", _PATH_ETAB);
+	} else if (fstat(fd, &stb) < 0) {
 		xlog(L_FATAL, "couldn't stat %s", _PATH_ETAB);
-	if (stb.st_mtime == last_modified)
-		return 0;
-	last_modified = stb.st_mtime;
+	} else if (stb.st_ino == last_inode) {
+		close(fd);
+		return counter;
+	} else {
+		close(last_fd);
+		last_fd = fd;
+		last_inode = stb.st_ino;
+	}
 
 	export_freeall();
 	memset(&my_client, 0, sizeof(my_client));
-	// export_read(export_file);
 	xtab_export_read();
+	++counter;
 
-	return 1;
+	return counter;
 }
 
 static nfs_export *
@@ -78,12 +89,17 @@ auth_authenticate_internal(char *what, struct sockaddr_in *caller,
 		/* return static nfs_export with details filled in */
 		char *n;
 		my_client.m_addrlist[0] = caller->sin_addr;
-		n = client_compose(caller->sin_addr);
+		n = client_compose(hp);
 		*error = unknown_host;
 		if (!n)
 			return NULL;
-		strcpy(my_client.m_hostname, *n?n:"DEFAULT");
-		free(n);
+		free(my_client.m_hostname);
+		if (*n) {
+			my_client.m_hostname = n;
+		} else {
+			free(n);
+			my_client.m_hostname = xstrdup("DEFAULT");
+		}
 		my_client.m_naddr = 1;
 		my_exp.m_client = &my_client;
 
@@ -144,11 +160,7 @@ auth_authenticate(char *what, struct sockaddr_in *caller, char *path)
 	epath[sizeof (epath) - 1] = '\0';
 	auth_fixpath(epath); /* strip duplicate '/' etc */
 
-	hp = get_reliable_hostbyaddr((const char*)&caller->sin_addr, sizeof(struct in_addr),
-				     AF_INET);
-	if (!hp)
-		hp = get_hostent((const char*)&caller->sin_addr, sizeof(struct in_addr),
-				     AF_INET);
+	hp = client_resolve(caller->sin_addr);
 	if (!hp)
 		return exp;