Author: kmachalkova Date: Thu Sep 24 18:36:41 2009 New Revision: 58755 URL: http://svn.opensuse.org/viewcvs/yast?rev=58755&view=rev Log: - Propose opening SSH port in SSH installation - Enable SSH service if the user wants to open SSH port in fwall Modified: trunk/network/src/clients/firewall_stage1_finish.ycp trunk/network/src/clients/firewall_stage1_proposal.ycp 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=58755&r1=58754&r2=58755&view=diff ============================================================================== --- trunk/network/src/clients/firewall_stage1_finish.ycp (original) +++ trunk/network/src/clients/firewall_stage1_finish.ycp Thu Sep 24 18:36:41 2009 @@ -8,6 +8,7 @@ { textdomain "network"; +import "Service"; import "SuSEFirewall"; import "SuSEFirewall4Network"; import "SuSEFirewallProposal"; @@ -55,7 +56,11 @@ //only if we have openssh package - proposal takes care //it gets installed if the user wants to open ssh port if (ssh_enabled) + { SuSEFirewall::SetServicesForZones (["service:sshd"], SuSEFirewall::GetKnownFirewallZones(), true ); + //enable SSH service if the port is to be opened (bnc#537980) + Service::Enable("sshd"); + } //this is equivalent to write-only, do not attempt to restart the service SuSEFirewall::WriteConfiguration(); 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=58755&r1=58754&r2=58755&view=diff ============================================================================== --- trunk/network/src/clients/firewall_stage1_proposal.ycp (original) +++ trunk/network/src/clients/firewall_stage1_proposal.ycp Thu Sep 24 18:36:41 2009 @@ -28,6 +28,7 @@ { textdomain "network"; + import "Linuxrc"; import "PackagesProposal"; import "ProductControl"; import "ProductFeatures"; @@ -45,6 +46,14 @@ ProductFeatures::GetBooleanFeature ("globals", "firewall_enable_ssh")); SuSEFirewall4Network::SetEnabled1stStage(ProductFeatures::GetBooleanFeature ("globals", "enable_firewall")); + + //we're installing over SSH, propose opening SSH port (bnc#535206) + if(Linuxrc::usessh()) { + SuSEFirewall4Network::SetSshEnabled1stStage (true); + } else { + SuSEFirewall4Network::SetSshEnabled1stStage (ProductFeatures::GetBooleanFeature ("globals", "firewall_enable_ssh")); + } + SuSEFirewall4Network::SetSshEnabled1stStage (ProductFeatures::GetBooleanFeature ("globals", "firewall_enable_ssh")); SuSEFirewallProposal::SetProposalInitialized(true); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org