Author: locilka Date: Thu Jul 21 13:48:48 2011 New Revision: 64923 URL: http://svn.opensuse.org/viewcvs/yast?rev=64923&view=rev Log: - Fixed Firewall and SSH proposal to be still able to adjust SSH independently on the firewall status (bnc#537980). - 2.20.13 Modified: trunk/network/VERSION trunk/network/package/yast2-network.changes trunk/network/src/clients/firewall_stage1_finish.ycp trunk/network/src/clients/firewall_stage1_proposal.ycp Modified: trunk/network/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/VERSION?rev=64923&r1=64922&r2=64923&view=diff ============================================================================== --- trunk/network/VERSION (original) +++ trunk/network/VERSION Thu Jul 21 13:48:48 2011 @@ -1 +1 @@ -2.20.12 +2.20.13 Modified: trunk/network/package/yast2-network.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/package/yast2-network.changes?rev=64923&r1=64922&r2=64923&view=diff ============================================================================== --- trunk/network/package/yast2-network.changes (original) +++ trunk/network/package/yast2-network.changes Thu Jul 21 13:48:48 2011 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Thu Jul 21 13:44:24 CEST 2011 - locilka@suse.cz + +- Fixed Firewall and SSH proposal to be still able to adjust SSH + independently on the firewall status (bnc#537980). +- 2.20.13 + +------------------------------------------------------------------- Fri Jul 1 13:42:16 CEST 2011 - mvidner@suse.cz - Proofread texts for translation (by A.Turrini, bnc#703190). Modified: trunk/network/src/clients/firewall_stage1_finish.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/firewall_stage1_finish.ycp?rev=64923&r1=64922&r2=64923&view=diff ============================================================================== --- trunk/network/src/clients/firewall_stage1_finish.ycp (original) +++ trunk/network/src/clients/firewall_stage1_finish.ycp Thu Jul 21 13:48:48 2011 @@ -28,20 +28,21 @@ y2debug("func=%1", func); y2debug("param=%1", param); +//we have those from the proposal +boolean fw_enabled = SuSEFirewall4Network::Enabled1stStage(); +boolean ssh_enabled = SuSEFirewall4Network::EnabledSsh1stStage(); + if (func == "Info") { return (any)$[ "steps" : 1, // progress step title "title" : _("Writing Firewall Configuration..."), - "when" : SuSEFirewallProposal::GetChangedByUser() ? [ `installation, `autoinst ] : [], + "when" : (SuSEFirewallProposal::GetChangedByUser() || ssh_enabled) ? [ `installation, `autoinst ] : [], ]; } else if (func == "Write") { - //we have those from the proposal - boolean fw_enabled = SuSEFirewall4Network::Enabled1stStage(); - boolean ssh_enabled = SuSEFirewall4Network::EnabledSsh1stStage(); y2milestone("After installation, firewall will be %1", fw_enabled ? sformat("enabled, ssh port will be %1", ssh_enabled ? "open" : "closed") : "disabled"); Modified: trunk/network/src/clients/firewall_stage1_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/network/src/clients/firewall_stage1_proposal.ycp?rev=64923&r1=64922&r2=64923&view=diff ============================================================================== --- trunk/network/src/clients/firewall_stage1_proposal.ycp (original) +++ trunk/network/src/clients/firewall_stage1_proposal.ycp Thu Jul 21 13:48:48 2011 @@ -127,8 +127,6 @@ SuSEFirewall4Network::SetSshEnabled1stStage (ProductFeatures::GetBooleanFeature ("globals", "firewall_enable_ssh")); } - SuSEFirewall4Network::SetSshEnabled1stStage (ProductFeatures::GetBooleanFeature ("globals", "firewall_enable_ssh")); - SuSEFirewallProposal::SetProposalInitialized(true); } @@ -147,27 +145,23 @@ _("Firewall will be disabled (enable</a>)") ) + "</li>\n"; - if (SuSEFirewall4Network::Enabled1stStage()) - { - output = output + "<li>" + (SuSEFirewall4Network::EnabledSsh1stStage() ? - _("SSH service will be enabled, SSH port will be open (disable and close</a>)") - : - _("SSH service will be disabled, SSH port will be blocked (enable and open</a>)") - ) + "</li>\n"; + output = output + "<li>" + (SuSEFirewall4Network::EnabledSsh1stStage() ? + _("SSH service will be enabled, SSH port will be open (disable and close</a>)") + : + _("SSH service will be disabled, SSH port will be blocked (enable and open</a>)") + ) + "</li>\n"; - } output = output + "</ul>\n"; ret = $[ - "preformatted_proposal" : output, - "warning_level" : `warning, - //"warning" : proposal["warning"]:nil, - "links" : [ - "firewall--enable_firewall_in_proposal", "firewall--disable_firewall_in_proposal", - "firewall--enable_ssh_in_proposal", "firewall--disable_ssh_in_proposal", - ] - ]; - + "preformatted_proposal" : output, + "warning_level" : `warning, + //"warning" : proposal["warning"]:nil, + "links" : [ + "firewall--enable_firewall_in_proposal", "firewall--disable_firewall_in_proposal", + "firewall--enable_ssh_in_proposal", "firewall--disable_ssh_in_proposal", + ] + ]; } else if ( func == "AskUser" ) { any chosen_link = param["chosen_id"]:nil; -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org