Attachment 319305 Details for Bug 535206

[patch] patch for yast2-network

network_ssh.diff (text/plain), 2.27 KB, created by Ludwig Nussel on 2009-09-22 13:52:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ludwig Nussel

Created: 2009-09-22 13:52:20 UTC

Size: 2.27 KB

patch

obsolete

>Index: network/src/clients/firewall_stage1_proposal.ycp
>===================================================================
>--- network/src/clients/firewall_stage1_proposal.ycp	(Revision 58690)
>+++ network/src/clients/firewall_stage1_proposal.ycp	(Arbeitskopie)
>@@ -33,6 +33,7 @@
>     import "ProductFeatures";
>     import "SuSEFirewall4Network";
>     import "SuSEFirewallProposal";
>+    import "Linuxrc";
> 
>     string proposal_id = "fw_1ststage";
> 
>@@ -44,8 +45,13 @@
>             ProductFeatures::GetBooleanFeature ("globals", "enable_firewall"), 
> 	    ProductFeatures::GetBooleanFeature ("globals", "firewall_enable_ssh"));
> 
>-        SuSEFirewall4Network::SetEnabled1stStage(ProductFeatures::GetBooleanFeature ("globals", "enable_firewall"));
>-        SuSEFirewall4Network::SetSshEnabled1stStage (ProductFeatures::GetBooleanFeature ("globals", "firewall_enable_ssh"));
>+	SuSEFirewall4Network::SetEnabled1stStage(ProductFeatures::GetBooleanFeature ("globals", "enable_firewall"));
>+	// open ssh port by default when using ssh install (bnc#535206)
>+	if(Linuxrc::usessh()) {
>+	    SuSEFirewall4Network::SetSshEnabled1stStage (true);
>+	} else {
>+	    SuSEFirewall4Network::SetSshEnabled1stStage (ProductFeatures::GetBooleanFeature ("globals", "firewall_enable_ssh"));
>+	}
> 
>         SuSEFirewallProposal::SetProposalInitialized(true);
>     }
>Index: network/src/clients/firewall_stage1_finish.ycp
>===================================================================
>--- network/src/clients/firewall_stage1_finish.ycp	(Revision 58690)
>+++ network/src/clients/firewall_stage1_finish.ycp	(Arbeitskopie)
>@@ -11,6 +11,8 @@
> import "SuSEFirewall";
> import "SuSEFirewall4Network";
> import "SuSEFirewallProposal";
>+import "Linuxrc";
>+import "Service";
> 
> any ret = nil;
> string func = "";
>@@ -57,6 +59,13 @@
>     if (ssh_enabled)
>         SuSEFirewall::SetServicesForZones (["service:sshd"], SuSEFirewall::GetKnownFirewallZones(), true );
> 
>+    // XXX: doesn't really belong here
>+    /* enable sshd if the user either opened the ssh port or if
>+     * we're using a remote install via ssh or vnc (bnc#535206) */
>+    if(ssh_enabled || Linuxrc::usessh() || Linuxrc::vnc()) {
>+	Service::Enable("sshd");
>+    }
>+
>     //this is equivalent to write-only, do not attempt to restart the service
>     SuSEFirewall::WriteConfiguration(); 
> }

Actions: View | Diff

Attachments on bug 535206: 319304 | 319305