X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=utils%2Fmountd%2Frmtab.c;h=844de511f48b07d76baac5b0b828b9e5520af33f;hb=74ca5e89cdd02a583861a4c353bcac4f712878a3;hp=869b5f88fd791881eee6d01951cdfe1185222b9d;hpb=2032d4680d3d0862a728ee0fa0b0675beccdf844;p=nfs-utils.git

diff --git a/utils/mountd/rmtab.c b/utils/mountd/rmtab.c
index 869b5f8..844de51 100644
--- a/utils/mountd/rmtab.c
+++ b/utils/mountd/rmtab.c
@@ -32,7 +32,7 @@ slink_safe_rename(const char * oldpath, const char * newpath)
 	int r;
 	struct stat s;
 	char slink_path[PATH_MAX];
-	char real_newpath = newpath;
+	const char *real_newpath = newpath;
 
 	if ((lstat(newpath, &s) == 0) && S_ISLNK(s.st_mode)) {
 		/* New path is a symbolic link, do not destroy but follow */
@@ -46,7 +46,7 @@ slink_safe_rename(const char * oldpath, const char * newpath)
 }
 
 void
-mountlist_add(nfs_export *exp, const char *path)
+mountlist_add(char *host, const char *path)
 {
 	struct rmtabent	xe;
 	struct rmtabent	*rep;
@@ -58,7 +58,7 @@ mountlist_add(nfs_export *exp, const char *path)
 	setrmtabent("r+");
 	while ((rep = getrmtabent(1, &pos)) != NULL) {
 		if (strcmp (rep->r_client,
-			    exp->m_client->m_hostname) == 0
+			    host) == 0
 		    && strcmp(rep->r_path, path) == 0) {
 			rep->r_count++;
 			putrmtabent(rep, &pos);
@@ -68,7 +68,7 @@ mountlist_add(nfs_export *exp, const char *path)
 		}
 	}
 	endrmtabent();
-	strncpy(xe.r_client, exp->m_client->m_hostname,
+	strncpy(xe.r_client, host,
 		sizeof (xe.r_client) - 1);
 	xe.r_client [sizeof (xe.r_client) - 1] = '\0';
 	strncpy(xe.r_path, path, sizeof (xe.r_path) - 1);
@@ -82,11 +82,10 @@ mountlist_add(nfs_export *exp, const char *path)
 }
 
 void
-mountlist_del(nfs_export *exp, const char *path)
+mountlist_del(char *hname, const char *path)
 {
 	struct rmtabent	*rep;
 	FILE		*fp;
-	char		*hname = exp->m_client->m_hostname;
 	int		lockid;
 	int		match;