Attachment 319304 Details for Bug 535206

[patch] patch for yast2-firewall

firewall_ssh.diff (text/plain), 2.29 KB, created by Ludwig Nussel on 2009-09-22 13:51:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ludwig Nussel

Created: 2009-09-22 13:51:46 UTC

Size: 2.29 KB

patch

obsolete

>Index: firewall/src/firewall_proposal.ycp
>===================================================================
>--- firewall/src/firewall_proposal.ycp	(Revision 58690)
>+++ firewall/src/firewall_proposal.ycp	(Arbeitskopie)
>@@ -23,11 +23,15 @@
> import "Progress";
> import "ProductFeatures";
> import "Report";
>+import "Linuxrc";
>+import "Service";
> 
> include "firewall/helps.ycp";
> 
> boolean enable_firewall_init_default = ProductFeatures::GetBooleanFeature ("globals", "enable_firewall"); 
>-boolean enable_ssh_default = ProductFeatures::GetBooleanFeature ("globals", "firewall_enable_ssh"); 
>+/* we keep track of whether ssh should be enabled ourselves. Kind of
>+ * sucks but SuSEFirewallProposal doesn't tell us */
>+boolean enable_ssh = ProductFeatures::GetBooleanFeature ("globals", "firewall_enable_ssh"); 
> 
> // run this only once
> if (!SuSEFirewallProposal::GetProposalInitialized()) {
>@@ -36,7 +40,7 @@
>     if (SuSEFirewall::SuSEFirewallIsInstalled()) {
> 	// variables from control file
> 	y2milestone("Default firewall values: enable_firewall=%1, enable_ssh=%2",
>-	    ProductFeatures::GetBooleanFeature ("globals", "enable_firewall"), ProductFeatures::GetBooleanFeature ("globals", "firewall_enable_ssh"));
>+	    ProductFeatures::GetBooleanFeature ("globals", "enable_firewall"), enable_ssh);
> 	SuSEFirewall::SetEnableService(ProductFeatures::GetBooleanFeature ("globals", "enable_firewall"));
> 	SuSEFirewall::SetStartService (ProductFeatures::GetBooleanFeature ("globals", "enable_firewall"));
>     // Package is missing
>@@ -134,6 +138,7 @@
> 	    SuSEFirewallProposal::OpenServiceOnNonDialUpInterfaces("ssh", ["ssh"]);
> 	}
> 	
>+	enable_ssh = true;
> 	ret = $[ "workflow_sequence" : `next ];
> 	SuSEFirewallProposal::SetChangedByUser(true);
> 
>@@ -153,6 +158,7 @@
> 		SuSEFirewall::RemoveService("ssh", "TCP", zone);
> 	});
> 
>+	enable_ssh = false;
> 	ret = $[ "workflow_sequence" : `next ];
> 	SuSEFirewallProposal::SetChangedByUser(true);
> 
>@@ -200,6 +206,12 @@
>     // Allways modified
>     SuSEFirewall::SetModified();
>     SuSEFirewall::Write();
>+    // 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 (enable_ssh || Linuxrc::usessh() || Linuxrc::vnc()) {
>+	Service::Enable("sshd");
>+    }
> }
> /* unknown function */
> else {

Actions: View | Diff

Attachments on bug 535206: 319304 | 319305