1*4882a593Smuzhiyuncommit e48f61d2f6df32a518bcb84db8c6eacfe5435c32 2*4882a593SmuzhiyunAuthor: Yu Ke <ke.yu@intel.com> 3*4882a593SmuzhiyunDate: Fri Oct 28 14:40:51 2011 +0800 4*4882a593Smuzhiyun 5*4882a593SmuzhiyunNFS export: fix syntax issue 6*4882a593Smuzhiyun 7*4882a593Smuzhiyunfix two syntax issue in /etc/exports: 8*4882a593Smuzhiyun1. if it is exported to everyone, should use "*", e.g. "/export *(xxx)" 9*4882a593Smuzhiyun2. explicitly specify subtree_check or no_subtree_check, required by latest nfs-utils 10*4882a593Smuzhiyun 11*4882a593SmuzhiyunUpstream-Status: Pending 12*4882a593Smuzhiyun 13*4882a593SmuzhiyunSigned-off-by: Yu Ke <ke.yu@intel.com> 14*4882a593Smuzhiyun 15*4882a593SmuzhiyunIndex: webmin-1.850/exports/save_export.cgi 16*4882a593Smuzhiyun=================================================================== 17*4882a593Smuzhiyun--- webmin-1.850.orig/exports/save_export.cgi 18*4882a593Smuzhiyun+++ webmin-1.850/exports/save_export.cgi 19*4882a593Smuzhiyun@@ -50,7 +50,7 @@ else { 20*4882a593Smuzhiyun &error(&text('save_enetmask', $in{'netmask'})); 21*4882a593Smuzhiyun $exp{'host'} = $in{'network'}."/".$in{'netmask'}; 22*4882a593Smuzhiyun } 23*4882a593Smuzhiyun- elsif ($in{'mode'} == 3) { $exp{'host'} = ""; } 24*4882a593Smuzhiyun+ elsif ($in{'mode'} == 3) { $exp{'host'} = "*"; } 25*4882a593Smuzhiyun else { 26*4882a593Smuzhiyun $in{'host'} =~ /\*/ || &to_ipaddress($in{'host'}) || 27*4882a593Smuzhiyun &error(&text('save_ehost', $in{'host'})); 28*4882a593Smuzhiyun@@ -87,6 +87,11 @@ else { 29*4882a593Smuzhiyun delete($opts{'no_subtree_check'}); 30*4882a593Smuzhiyun delete($opts{'subtree_check'}); 31*4882a593Smuzhiyun $opts{'no_subtree_check'} = "" if ($in{'no_subtree_check'}); 32*4882a593Smuzhiyun+ if ($in{'no_subtree_check'}) { 33*4882a593Smuzhiyun+ $opts{'no_subtree_check'} = ""; 34*4882a593Smuzhiyun+ } else { 35*4882a593Smuzhiyun+ $opts{'subtree_check'} = ""; 36*4882a593Smuzhiyun+ } 37*4882a593Smuzhiyun 38*4882a593Smuzhiyun delete($opts{'nohide'}); 39*4882a593Smuzhiyun delete($opts{'hide'}); 40