X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=support%2Fexport%2Frmtab.c;h=b49e1aaa9c121922d943a4b91cad496b9f9c4924;hp=8f392a7e83ffc614bd170b2bc4bead0f59464888;hb=9bb85c5e8d2285f82367c75df5530a71a9a5a5f2;hpb=f24884196dac4cffc3ae79cf87cf51d892cda46c

diff --git a/support/export/rmtab.c b/support/export/rmtab.c
index 8f392a7..b49e1aa 100644
--- a/support/export/rmtab.c
+++ b/support/export/rmtab.c
@@ -23,7 +23,7 @@ int
 rmtab_read(void)
 {
 	struct rmtabent		*rep;
-	nfs_export		*exp;
+	nfs_export		*exp = NULL;
 
 	setrmtabent("r");
 	while ((rep = getrmtabent(1, NULL)) != NULL) {
@@ -31,7 +31,7 @@ rmtab_read(void)
 		int			htype;
 		
 		htype = client_gettype(rep->r_client);
-		if (htype == MCL_FQDN || htype == MCL_SUBNETWORK
+		if ((htype == MCL_FQDN || htype == MCL_SUBNETWORK)
 		    && (hp = gethostbyname (rep->r_client))
 		    && (hp = hostent_dup (hp),
 			exp = export_allowed (hp, rep->r_path))) {
@@ -57,7 +57,7 @@ rmtab_read(void)
 		   file. */
 		int	lockid;
 		FILE	*fp;
-		if ((lockid = xflock(_PATH_RMTAB, "w")) < 0)
+		if ((lockid = xflock(_PATH_RMTABLCK, "w")) < 0)
 			return -1;
 		rewindrmtabent();
 		if (!(fp = fsetrmtabent(_PATH_RMTABTMP, "w"))) {