rpms/nfs-utils/devel nfs-utils-1.0.10-export-nosubtree.patch, 1.1, 1.2

[fedora-cvs-commits at redhat.com]

Author: steved

Update of /cvs/dist/rpms/nfs-utils/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26676

Modified Files:
	nfs-utils-1.0.10-export-nosubtree.patch 
Log Message:
Updated export man page to say no_subtree_check is on by default.


nfs-utils-1.0.10-export-nosubtree.patch:
 support/export/export.c    |    2 +-
 support/export/xtab.c      |    2 +-
 support/include/nfslib.h   |    2 +-
 support/nfs/exports.c      |   26 ++++++++------------------
 utils/exportfs/exports.man |   24 ++++++------------------
 5 files changed, 17 insertions(+), 39 deletions(-)

Index: nfs-utils-1.0.10-export-nosubtree.patch
===================================================================
RCS file: /cvs/dist/rpms/nfs-utils/devel/nfs-utils-1.0.10-export-nosubtree.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nfs-utils-1.0.10-export-nosubtree.patch	31 Oct 2006 16:38:58 -0000	1.1
+++ nfs-utils-1.0.10-export-nosubtree.patch	31 Oct 2006 19:37:39 -0000	1.2
@@ -1,5 +1,5 @@
 --- nfs-utils-1.0.10/support/export/export.c.orig	2006-08-07 02:40:50.000000000 -0400
-+++ nfs-utils-1.0.10/support/export/export.c	2006-10-31 11:21:12.458470000 -0500
++++ nfs-utils-1.0.10/support/export/export.c	2006-10-31 14:28:51.582276000 -0500
 @@ -34,7 +34,7 @@ export_read(char *fname)
  	nfs_export		*exp;
  
@@ -10,7 +10,7 @@
  	  if (!exp)
  	    export_create(eep,0);
 --- nfs-utils-1.0.10/support/export/xtab.c.orig	2006-08-07 02:40:50.000000000 -0400
-+++ nfs-utils-1.0.10/support/export/xtab.c	2006-10-31 11:21:29.838160000 -0500
++++ nfs-utils-1.0.10/support/export/xtab.c	2006-10-31 14:28:51.594264000 -0500
 @@ -36,7 +36,7 @@ xtab_read(char *xtab, int is_export)
  	if ((lockid = xflock(xtab, "r")) < 0)
  		return 0;
@@ -21,7 +21,7 @@
  		    !(exp = export_create(xp, is_export!=1))) {
  			continue;
 --- nfs-utils-1.0.10/support/include/nfslib.h.orig	2006-08-07 02:40:50.000000000 -0400
-+++ nfs-utils-1.0.10/support/include/nfslib.h	2006-10-31 11:21:01.807421000 -0500
++++ nfs-utils-1.0.10/support/include/nfslib.h	2006-10-31 14:28:51.596262000 -0500
 @@ -92,7 +92,7 @@ struct rmtabent {
   * configuration file parsing
   */
@@ -32,7 +32,7 @@
  void			endexportent(void);
  struct exportent *	mkexportent(char *hname, char *path, char *opts);
 --- nfs-utils-1.0.10/support/nfs/exports.c.orig	2006-08-07 02:40:50.000000000 -0400
-+++ nfs-utils-1.0.10/support/nfs/exports.c	2006-10-31 11:22:44.654243000 -0500
++++ nfs-utils-1.0.10/support/nfs/exports.c	2006-10-31 14:28:51.601257000 -0500
 @@ -32,7 +32,8 @@
  #include "xio.h"
  
@@ -125,3 +125,50 @@
  	return 1;
  }
  
+--- nfs-utils-1.0.10/utils/exportfs/exports.man.orig	2006-08-07 02:40:50.000000000 -0400
++++ nfs-utils-1.0.10/utils/exportfs/exports.man	2006-10-31 14:29:07.004705000 -0500
+@@ -117,7 +117,7 @@ storage (see
+ above).
+ 
+ In releases of nfs-utils upto and including 1.0.0, this option was the
+-default.  In all subsequence releases,
++default.  In this and future releases,
+ .I sync
+ is the default, and
+ .I async
+@@ -183,9 +183,10 @@ with crossmnt to exported filesystems mo
+ filesystem "B" is mounted on a parent "A", setting crossmnt on "A" has
+ the same effect as setting "nohide" on B.
+ .TP
+-.IR no_subtree_check
+-This option disables subtree checking, which has mild security
+-implications, but can improve reliability in some circumstances.
++.IR subtree_check
++This option enables subtree checking, which does add
++another level of security, but can be unreliability 
++in some circumstances.
+ 
+ If a subdirectory of a filesystem is exported, but the whole
+ filesystem isn't then whenever a NFS request arrives, the server must
+@@ -213,20 +214,7 @@ readonly, and at least doesn't see many 
+ /var) and for which subdirectories may be exported, should probably be
+ exported with subtree checks enabled.
+ 
+-The default of having subtree checks enabled, can be explicitly
+-requested with
+-.IR subtree_check .
+-
+-From release 1.1.0 of nfs-utils onwards, the default will be
+-.I no_subtree_check
+-as subtree_checking tends to cause more problems than it is worth.
+-If you genuinely require subtree checking, you should explicitly put
+-that option in the
+-.B exports
+-file.  If you put neither option,
+-.I exportfs
+-will warn you that the change is pending.
+-
++This type of subtree checking is disabled by default.
+ .TP
+ .IR insecure_locks
+ .TP