[PATCH 5/6] nfs-utils - Dynamic Pseudo Root - Release 4

[Steve Dickson]

commit d057cf2c5a94d7a321432dcd48398d38f49abb8c
Author: Steve Dickson <steved at redhat.com>
Date:   Tue Mar 24 15:29:40 2009 -0400

    Removed v4root_check variable
    
    Signed-off-by: Steve Dickson <steved at redhat.com>

diff --git a/support/export/xtab.c b/support/export/xtab.c
index 5c24b10..6b2de28 100644
--- a/support/export/xtab.c
+++ b/support/export/xtab.c
@@ -21,7 +21,7 @@
 #include "xlog.h"
 #include "v4root.h"
 
-int v4root_needed, v4root_check;
+int v4root_needed;
 static void cond_rename(char *newfile, char *oldfile);
 
 static int
@@ -38,7 +38,7 @@ xtab_read(char *xtab, int is_export)
 	if ((lockid = xflock(xtab, "r")) < 0)
 		return 0;
 	setexportent(xtab, "r");
-	if (v4root_check && is_export == 1)
+	if (is_export == 1)
 		v4root_needed = 1;
 	while ((xp = getexportent(is_export==0, 0)) != NULL) {
 		if (!(exp = export_lookup(xp->e_hostname, xp->e_path, is_export != 1)) &&
diff --git a/support/include/v4root.h b/support/include/v4root.h
index 39a197f..ffe6967 100644
--- a/support/include/v4root.h
+++ b/support/include/v4root.h
@@ -9,7 +9,7 @@
 #ifndef V4ROOT_H
 #define V4ROOT_H
 
-extern int v4root_needed, v4root_check;
+extern int v4root_needed;
 
 extern struct exportent *v4root_chkroot(int , unsigned int , char *);
 extern struct exportent *v4root_export(char *, int);
diff --git a/utils/mountd/v4root.c b/utils/mountd/v4root.c
index b5d1564..33c0b49 100644
--- a/utils/mountd/v4root.c
+++ b/utils/mountd/v4root.c
@@ -74,7 +74,7 @@ static inline int hashint(unsigned int num)
 void v4root_set(void);
 void v4root_unset(void);
 
-int v4root_needed, v4root_check;
+int v4root_needed;
 
 static nfs_export pr_export = {
 	.m_next = NULL,