X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=support%2Fexport%2Fxtab.c;h=510765a3f0d59b5517e06b0542f1eb8d0d702f03;hp=d9265a24e078627725ea4319e89f43a72f5cb7d9;hb=4cacc965afc4fb03a465ffcc6cb3078aeadc3818;hpb=2d33968c66860ad772aac918992986fe4865b3a4

diff --git a/support/export/xtab.c b/support/export/xtab.c
index d9265a2..510765a 100644
--- a/support/export/xtab.c
+++ b/support/export/xtab.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/fcntl.h>
 #include <unistd.h>
@@ -65,6 +67,9 @@ xtab_mount_read(void)
 	if ((fd=open(_PATH_PROC_EXPORTS, O_RDONLY))>=0) {
 		close(fd);
 		return xtab_read(_PATH_PROC_EXPORTS, 0);
+	} else if ((fd=open(_PATH_PROC_EXPORTS_ALT, O_RDONLY) >= 0)) {
+		close(fd);
+		return xtab_read(_PATH_PROC_EXPORTS_ALT, 0);
 	} else
 		return xtab_read(_PATH_XTAB, 2);
 }
@@ -75,6 +80,12 @@ xtab_export_read(void)
 	return xtab_read(_PATH_ETAB, 1);
 }
 
+/*
+ * mountd now keeps an open fd for the etab at all times to make sure that the
+ * inode number changes when the xtab_export_write is done. If you change the
+ * routine below such that the files are edited in place, then you'll need to
+ * fix the auth_reload logic as well...
+ */
 static int
 xtab_write(char *xtab, char *xtabtmp, int is_export)
 {
@@ -89,7 +100,7 @@ xtab_write(char *xtab, char *xtabtmp, int is_export)
 	setexportent(xtabtmp, "w");
 
 	for (i = 0; i < MCL_MAXTYPES; i++) {
-		for (exp = exportlist[i]; exp; exp = exp->m_next) {
+		for (exp = exportlist[i].p_head; exp; exp = exp->m_next) {
 			if (is_export && !exp->m_xtabent)
 				continue;
 			if (!is_export && ! exp->m_exported)
@@ -97,10 +108,7 @@ xtab_write(char *xtab, char *xtabtmp, int is_export)
 
 			/* write out the export entry using the FQDN */
 			xe = exp->m_export;
-			strncpy(xe.e_hostname,
-				exp->m_client->m_hostname,
-				sizeof (xe.e_hostname) - 1);
-			xe.e_hostname[sizeof (xe.e_hostname) - 1] = '\0';
+			xe.e_hostname = exp->m_client->m_hostname;
 			putexportent(&xe);
 		}
 	}
@@ -135,9 +143,7 @@ xtab_append(nfs_export *exp)
 		return;
 	setexportent(_PATH_XTAB, "a");
 	xe = exp->m_export;
-	strncpy(xe.e_hostname, exp->m_client->m_hostname,
-	       sizeof (xe.e_hostname) - 1);
-	xe.e_hostname[sizeof (xe.e_hostname) - 1] = '\0';
+	xe.e_hostname = exp->m_client->m_hostname;
 	putexportent(&xe);
 	endexportent();
 	xfunlock(lockid);
@@ -146,7 +152,7 @@ xtab_append(nfs_export *exp)
 
 /*
  * rename newfile onto oldfile unless
- * they are identical 
+ * they are identical
  */
 static void cond_rename(char *newfile, char *oldfile)
 {