Author: mfilka
Date: Thu May 3 11:10:31 2012
New Revision: 68065
URL: http://svn.opensuse.org/viewcvs/yast?rev=68065&view=rev
Log:
added checkbox for enabling NFS_SECURITY_GSS, bnc#681190
Modified:
trunk/nfs-client/VERSION
trunk/nfs-client/package/yast2-nfs-client.changes
trunk/nfs-client/src/Nfs.ycp
trunk/nfs-client/src/ui.ycp
trunk/nfs-client/testsuite/tests/readwrite.out
trunk/nfs-client/testsuite/tests/readwrite.ycp
trunk/nfs-client/testsuite/tests/readwrite2.out
trunk/nfs-client/testsuite/tests/readwrite2.ycp
Modified: trunk/nfs-client/VERSION
URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/VERSION?rev=68065&r1=68064&r2=68065&view=diff
==============================================================================
--- trunk/nfs-client/VERSION (original)
+++ trunk/nfs-client/VERSION Thu May 3 11:10:31 2012
@@ -1 +1 @@
-2.21.5
+2.21.6
Modified: trunk/nfs-client/package/yast2-nfs-client.changes
URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/package/yast2-nfs-client.changes?rev=68065&r1=68064&r2=68065&view=diff
==============================================================================
--- trunk/nfs-client/package/yast2-nfs-client.changes (original)
+++ trunk/nfs-client/package/yast2-nfs-client.changes Thu May 3 11:10:31 2012
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Thu May 3 06:45:39 UTC 2012 - mfilka@suse.com
+
+- added option for enabling NFS4 GSS - bnc#681190
+- 2.21.6
+
+-------------------------------------------------------------------
Thu Mar 29 15:28:12 CEST 2012 - jsuchome@suse.cz
- merged proofread texts
Modified: trunk/nfs-client/src/Nfs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/Nfs.ycp?rev=68065&r1=68064&r2=68065&view=diff
==============================================================================
--- trunk/nfs-client/src/Nfs.ycp (original)
+++ trunk/nfs-client/src/Nfs.ycp Thu May 3 11:10:31 2012
@@ -74,6 +74,8 @@
global boolean nfs4_enabled = nil;
+ global boolean nfs_gss_enabled = nil;
+
global string idmapd_domain = "";
string portmapper = "";
@@ -85,6 +87,10 @@
return (SCR::Read(.sysconfig.nfs.NFS4_SUPPORT)=="yes");
}
+ boolean ReadNfsGss () {
+ return (SCR::Read(.sysconfig.nfs.NFS_SECURITY_GSS)=="yes");
+ }
+
string ReadIdmapd() {
return (string) SCR::Read(.etc.idmapd_conf, "Domain");
}
@@ -101,6 +107,12 @@
else
nfs4_enabled = ReadNfs4();
+ if ( haskey(settings, "enable_nfs_gss") ) {
+ nfs_gss_enabled = settings["enable_nfs_gss"]:false;
+ }
+ else
+ nfs_gss_enabled = ReadNfsGss();
+
if ( haskey(settings, "idmapd_domain") ) {
idmapd_domain = settings["idmapd_domain"]:"localdomain";
}
@@ -171,6 +183,7 @@
map settings = $[];
settings["enable_nfs4"] = nfs4_enabled;
+ settings["enable_nfs_gss"] = nfs_gss_enabled;
settings["idmapd_domain"] = idmapd_domain;
list entries = maplist(map entry, nfs_entries, ``{
@@ -299,6 +312,7 @@
}
nfs4_enabled = (SCR::Read(.sysconfig.nfs.NFS4_SUPPORT)=="yes");
+ nfs_gss_enabled = (SCR::Read(.sysconfig.nfs.NFS_SECURITY_GSS)=="yes");
idmapd_domain = (string) SCR::Read(.etc.idmapd_conf, "Domain");
boolean progress_orig = Progress::set(false);
@@ -394,6 +408,8 @@
{
SCR::Write(.sysconfig.nfs.NFS4_SUPPORT,"no");
}
+ SCR::Write( .sysconfig.nfs.NFS_SECURITY_GSS, nfs_gss_enabled ? "yes" : "no");
+
boolean progress_orig = Progress::set (false);
SuSEFirewall::WriteOnly ();
Progress::set (progress_orig);
Modified: trunk/nfs-client/src/ui.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/src/ui.ycp?rev=68065&r1=68064&r2=68065&view=diff
==============================================================================
--- trunk/nfs-client/src/ui.ycp (original)
+++ trunk/nfs-client/src/ui.ycp Thu May 3 11:10:31 2012
@@ -239,28 +239,28 @@
`VBox(
`VSpacing(0.2),
`HBox(
- TextAndButton (
- `ComboBox(
- `id(`serverent),`opt(`editable),
- // text entry label
- _("&NFS Server Hostname"), servers ),
- // pushbutton label
- // choose a host from a list
- // appears in help text too
- `PushButton (`id (`choose), _("Choo&se"))
- ),
+ TextAndButton (
+ `ComboBox(
+ `id(`serverent),`opt(`editable),
+ // text entry label
+ _("&NFS Server Hostname"), servers ),
+ // pushbutton label
+ // choose a host from a list
+ // appears in help text too
+ `PushButton (`id (`choose), _("Choo&se"))
+ ),
`HSpacing(0.5),
- TextAndButton (
+ TextAndButton (
`InputField( `id(`pathent),
- `opt(`hstretch),
- // textentry label
- _("&Remote Directory"), pth),
- // pushbutton label,
+ `opt(`hstretch),
+ // textentry label
+ _("&Remote Directory"), pth),
+ // pushbutton label,
// select from a list of remote filesystems
// make it short
// appears in help text too
`PushButton (`id (`pathent_list), _("&Select"))
- )
+ )
),
`Left( `CheckBox(`id(`nfs4), _("NFS&v4 Share"), nfs4)),
`Left(
@@ -561,6 +561,8 @@
`HStretch()
),
`VSpacing (1),
+ `Left(`CheckBox(`id(`enable_nfs_gss), `opt( `notify), _("Enable &GSS Security"))),
+ `VSpacing (1),
fw_cwm_widget["custom_widget"]:`Empty (),
`VStretch()
);
@@ -595,6 +597,7 @@
UI::ChangeWidget(`id(`enable_nfs4), `Value, Nfs::nfs4_enabled != false);
UI::ChangeWidget( `id(`nfs4_domain), `Enabled, Nfs::nfs4_enabled != false);
UI::ChangeWidget(`id(`nfs4_domain), `Value, Nfs::idmapd_domain);
+ UI::ChangeWidget(`id(`enable_nfs_gss), `Value, Nfs::nfs_gss_enabled != false);
}
void SaveFstabEntries( )
@@ -606,6 +609,7 @@
{
CWMFirewallInterfaces::OpenFirewallStore (fw_cwm_widget, "", event);
Nfs::nfs4_enabled = (boolean) UI::QueryWidget(`id(`enable_nfs4),`Value);
+ Nfs::nfs_gss_enabled = (boolean) UI::QueryWidget(`id(`enable_nfs_gss),`Value);
Nfs::idmapd_domain = (string) UI::QueryWidget(`id(`nfs4_domain),`Value);
}
Modified: trunk/nfs-client/testsuite/tests/readwrite.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/testsuite/tests/readwrite.out?rev=68065&r1=68064&r2=68065&view=diff
==============================================================================
--- trunk/nfs-client/testsuite/tests/readwrite.out (original)
+++ trunk/nfs-client/testsuite/tests/readwrite.out Thu May 3 11:10:31 2012
@@ -1,6 +1,7 @@
Dump Read
Read .etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"reiserfs"], $["file":"/home", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/home", "vfstype":"nfs"], $["file":"/var/spool/mail", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/var/spool/mail", "vfstype":"nfs"], $["file":"/a\\040space", "freq":1, "mntops":"defaults", "passno":3, "spec":"/dev/hda7", "vfstype":"reiserfs"], $["file":"/b\\040space", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/space\\040dir", "vfstype":"nfs"]]
Read .sysconfig.nfs.NFS4_SUPPORT "yes"
+Read .sysconfig.nfs.NFS_SECURITY_GSS "yes"
Read .etc.idmapd_conf "Domain" "localhost"
Execute .target.bash "/sbin/chkconfig -l SuSEfirewall2_init | /usr/bin/grep -q '[0-6]:on'" 0
Execute .target.bash "/sbin/chkconfig -l SuSEfirewall2_setup | /usr/bin/grep -q '[0-6]:on'" 0
@@ -21,6 +22,7 @@
Execute .target.bash_output "/sbin/chkconfig -a nfsboot" $["exit":0, "stderr":"", "stdout":""]
Write .sysconfig.nfs.NFS4_SUPPORT "yes" true
Write .etc.idmapd_conf ["Domain", "localhost"] true
+Write .sysconfig.nfs.NFS_SECURITY_GSS "yes" true
Execute .target.bash_output "/sbin/service nfs stop" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""]
Execute .target.bash "/sbin/service portmap status" $["TERM":"raw"] 0
Execute .target.bash_output "/sbin/service nfs start" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""]
Modified: trunk/nfs-client/testsuite/tests/readwrite.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/testsuite/tests/readwrite.ycp?rev=68065&r1=68064&r2=68065&view=diff
==============================================================================
--- trunk/nfs-client/testsuite/tests/readwrite.ycp (original)
+++ trunk/nfs-client/testsuite/tests/readwrite.ycp Thu May 3 11:10:31 2012
@@ -118,6 +118,7 @@
"sysconfig": $[
"nfs" : $[
"NFS4_SUPPORT": "yes",
+ "NFS_SECURITY_GSS": "yes",
],
],
"target" : $[
Modified: trunk/nfs-client/testsuite/tests/readwrite2.out
URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/testsuite/tests/readwrite2.out?rev=68065&r1=68064&r2=68065&view=diff
==============================================================================
--- trunk/nfs-client/testsuite/tests/readwrite2.out (original)
+++ trunk/nfs-client/testsuite/tests/readwrite2.out Thu May 3 11:10:31 2012
@@ -3,6 +3,7 @@
Dump
Read .etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"reiserfs"], $["file":"/home", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/home", "vfstype":"nfs"], $["file":"/var/spool/mail", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/var/spool/mail", "vfstype":"nfs"], $["file":"/a\\040space", "freq":1, "mntops":"defaults", "passno":3, "spec":"/dev/hda7", "vfstype":"reiserfs"], $["file":"/b\\040space", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/space\\040dir", "vfstype":"nfs"]]
Read .sysconfig.nfs.NFS4_SUPPORT "no"
+Read .sysconfig.nfs.NFS_SECURITY_GSS "no"
Read .etc.idmapd_conf "Domain" "localhost"
Execute .target.bash "/sbin/chkconfig -l SuSEfirewall2_init | /usr/bin/grep -q '[0-6]:on'" 0
Execute .target.bash "/sbin/chkconfig -l SuSEfirewall2_setup | /usr/bin/grep -q '[0-6]:on'" 0
@@ -24,6 +25,7 @@
Read .init.scripts.comment "nfsboot" $["nfs":$[], "portmap":$[]]
Execute .target.bash_output "/sbin/chkconfig -a nfsboot" $["exit":0, "stderr":"", "stdout":""]
Write .sysconfig.nfs.NFS4_SUPPORT "no" true
+Write .sysconfig.nfs.NFS_SECURITY_GSS "no" true
Execute .target.bash_output "/sbin/service nfs stop" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""]
Execute .target.bash "/sbin/service portmap status" $["TERM":"raw"] 0
Execute .target.bash_output "/sbin/service nfs start" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""]
@@ -34,6 +36,7 @@
Dump
Read .etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"reiserfs"], $["file":"/home", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/home", "vfstype":"nfs"], $["file":"/var/spool/mail", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/var/spool/mail", "vfstype":"nfs"], $["file":"/a\\040space", "freq":1, "mntops":"defaults", "passno":3, "spec":"/dev/hda7", "vfstype":"reiserfs"], $["file":"/b\\040space", "freq":0, "mntops":"defaults", "passno":0, "spec":"foo.bar.com:/space\\040dir", "vfstype":"nfs"]]
Read .sysconfig.nfs.NFS4_SUPPORT "no"
+Read .sysconfig.nfs.NFS_SECURITY_GSS "no"
Read .etc.idmapd_conf "Domain" "localhost"
Return true
Dump
@@ -55,6 +58,7 @@
Read .init.scripts.comment "nfsboot" $["nfs":$[], "portmap":$[]]
Execute .target.bash_output "/sbin/chkconfig -a nfsboot" $["exit":0, "stderr":"", "stdout":""]
Write .sysconfig.nfs.NFS4_SUPPORT "no" true
+Write .sysconfig.nfs.NFS_SECURITY_GSS "no" true
Execute .target.bash_output "/sbin/service nfs stop" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""]
Execute .target.bash "/sbin/service portmap status" $["TERM":"raw"] 0
Execute .target.bash_output "/sbin/service nfs start" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""]
@@ -65,6 +69,7 @@
Dump
Read .etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"ext3"]]
Read .sysconfig.nfs.NFS4_SUPPORT "no"
+Read .sysconfig.nfs.NFS_SECURITY_GSS "no"
Read .etc.idmapd_conf "Domain" "localhost"
Return true
Dump
@@ -74,6 +79,7 @@
Execute .target.bash "/bin/cp $ORIG $BACKUP" $["BACKUP":"/etc/fstab.YaST2.save", "ORIG":"/etc/fstab"] 0
Write .etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"ext3"]] true
Write .sysconfig.nfs.NFS4_SUPPORT "no" true
+Write .sysconfig.nfs.NFS_SECURITY_GSS "no" true
Execute .target.bash_output "/sbin/service nfs stop" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""]
Return true
Dump
@@ -81,6 +87,7 @@
Dump
Read .etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"ext3"]]
Read .sysconfig.nfs.NFS4_SUPPORT "no"
+Read .sysconfig.nfs.NFS_SECURITY_GSS "no"
Read .etc.idmapd_conf "Domain" "localhost"
Return true
Dump
@@ -90,5 +97,6 @@
Execute .target.bash "/bin/cp $ORIG $BACKUP" $["BACKUP":"/etc/fstab.YaST2.save", "ORIG":"/etc/fstab"] 0
Write .etc.fstab [$["file":"/", "freq":1, "mntops":"defaults", "passno":2, "spec":"/dev/hda6", "vfstype":"ext3"]] true
Write .sysconfig.nfs.NFS4_SUPPORT "no" true
+Write .sysconfig.nfs.NFS_SECURITY_GSS "no" true
Execute .target.bash_output "/sbin/service nfs stop" $["TERM":"raw"] $["exit":0, "stderr":"", "stdout":""]
Return true
Modified: trunk/nfs-client/testsuite/tests/readwrite2.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/nfs-client/testsuite/tests/readwrite2.ycp?rev=68065&r1=68064&r2=68065&view=diff
==============================================================================
--- trunk/nfs-client/testsuite/tests/readwrite2.ycp (original)
+++ trunk/nfs-client/testsuite/tests/readwrite2.ycp Thu May 3 11:10:31 2012
@@ -115,6 +115,7 @@
"sysconfig": $[
"nfs" : $[
"NFS4_SUPPORT": "no",
+ "NFS_SECURITY_GSS": "no",
],
],
"target" : $[
--
To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org
For additional commands, e-mail: yast-commit+help@opensuse.org
