summaryrefslogtreecommitdiffstats
path: root/import-layers/meta-openembedded/meta-webserver/recipes-webadmin/webmin/files/nfs-export.patch
blob: 426d63737e840f22b7b168e2641cc9d685a64f9e (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
commit e48f61d2f6df32a518bcb84db8c6eacfe5435c32
Author: Yu Ke <ke.yu@intel.com>
Date:   Fri Oct 28 14:40:51 2011 +0800

NFS export: fix syntax issue

fix two syntax issue in /etc/exports:
1. if it is exported to everyone, should use "*", e.g. "/export  *(xxx)"
2. explicitly specify subtree_check or no_subtree_check, required by latest nfs-utils

Upstream-Status: Pending

Signed-off-by: Yu Ke <ke.yu@intel.com>

Index: webmin-1.850/exports/save_export.cgi
===================================================================
--- webmin-1.850.orig/exports/save_export.cgi
+++ webmin-1.850/exports/save_export.cgi
@@ -50,7 +50,7 @@ else {
 			&error(&text('save_enetmask', $in{'netmask'}));
 		$exp{'host'} = $in{'network'}."/".$in{'netmask'};
 		}
-	elsif ($in{'mode'} == 3) { $exp{'host'} = ""; }
+	elsif ($in{'mode'} == 3) { $exp{'host'} = "*"; }
 	else {
 		$in{'host'} =~ /\*/ || &to_ipaddress($in{'host'}) ||
 			&error(&text('save_ehost', $in{'host'}));
@@ -87,6 +87,11 @@ else {
 	delete($opts{'no_subtree_check'});
 	delete($opts{'subtree_check'});
 	$opts{'no_subtree_check'} = "" if ($in{'no_subtree_check'});
+	if ($in{'no_subtree_check'}) {
+		$opts{'no_subtree_check'} = "";
+	} else {
+		$opts{'subtree_check'} = "";
+	}
 
 	delete($opts{'nohide'});
 	delete($opts{'hide'});
OpenPOWER on IntegriCloud