|
Lines 23-33
Link Here
|
| 23 |
import "Progress"; |
23 |
import "Progress"; |
| 24 |
import "ProductFeatures"; |
24 |
import "ProductFeatures"; |
| 25 |
import "Report"; |
25 |
import "Report"; |
|
|
26 |
import "Linuxrc"; |
| 27 |
import "Service"; |
| 26 |
|
28 |
|
| 27 |
include "firewall/helps.ycp"; |
29 |
include "firewall/helps.ycp"; |
| 28 |
|
30 |
|
| 29 |
boolean enable_firewall_init_default = ProductFeatures::GetBooleanFeature ("globals", "enable_firewall"); |
31 |
boolean enable_firewall_init_default = ProductFeatures::GetBooleanFeature ("globals", "enable_firewall"); |
| 30 |
boolean enable_ssh_default = ProductFeatures::GetBooleanFeature ("globals", "firewall_enable_ssh"); |
32 |
/* we keep track of whether ssh should be enabled ourselves. Kind of |
|
|
33 |
* sucks but SuSEFirewallProposal doesn't tell us */ |
| 34 |
boolean enable_ssh = ProductFeatures::GetBooleanFeature ("globals", "firewall_enable_ssh"); |
| 31 |
|
35 |
|
| 32 |
// run this only once |
36 |
// run this only once |
| 33 |
if (!SuSEFirewallProposal::GetProposalInitialized()) { |
37 |
if (!SuSEFirewallProposal::GetProposalInitialized()) { |
|
Lines 36-42
Link Here
|
| 36 |
if (SuSEFirewall::SuSEFirewallIsInstalled()) { |
40 |
if (SuSEFirewall::SuSEFirewallIsInstalled()) { |
| 37 |
// variables from control file |
41 |
// variables from control file |
| 38 |
y2milestone("Default firewall values: enable_firewall=%1, enable_ssh=%2", |
42 |
y2milestone("Default firewall values: enable_firewall=%1, enable_ssh=%2", |
| 39 |
ProductFeatures::GetBooleanFeature ("globals", "enable_firewall"), ProductFeatures::GetBooleanFeature ("globals", "firewall_enable_ssh")); |
43 |
ProductFeatures::GetBooleanFeature ("globals", "enable_firewall"), enable_ssh); |
| 40 |
SuSEFirewall::SetEnableService(ProductFeatures::GetBooleanFeature ("globals", "enable_firewall")); |
44 |
SuSEFirewall::SetEnableService(ProductFeatures::GetBooleanFeature ("globals", "enable_firewall")); |
| 41 |
SuSEFirewall::SetStartService (ProductFeatures::GetBooleanFeature ("globals", "enable_firewall")); |
45 |
SuSEFirewall::SetStartService (ProductFeatures::GetBooleanFeature ("globals", "enable_firewall")); |
| 42 |
// Package is missing |
46 |
// Package is missing |
|
Lines 134-139
Link Here
|
| 134 |
SuSEFirewallProposal::OpenServiceOnNonDialUpInterfaces("ssh", ["ssh"]); |
138 |
SuSEFirewallProposal::OpenServiceOnNonDialUpInterfaces("ssh", ["ssh"]); |
| 135 |
} |
139 |
} |
| 136 |
|
140 |
|
|
|
141 |
enable_ssh = true; |
| 137 |
ret = $[ "workflow_sequence" : `next ]; |
142 |
ret = $[ "workflow_sequence" : `next ]; |
| 138 |
SuSEFirewallProposal::SetChangedByUser(true); |
143 |
SuSEFirewallProposal::SetChangedByUser(true); |
| 139 |
|
144 |
|
|
Lines 153-158
Link Here
|
| 153 |
SuSEFirewall::RemoveService("ssh", "TCP", zone); |
158 |
SuSEFirewall::RemoveService("ssh", "TCP", zone); |
| 154 |
}); |
159 |
}); |
| 155 |
|
160 |
|
|
|
161 |
enable_ssh = false; |
| 156 |
ret = $[ "workflow_sequence" : `next ]; |
162 |
ret = $[ "workflow_sequence" : `next ]; |
| 157 |
SuSEFirewallProposal::SetChangedByUser(true); |
163 |
SuSEFirewallProposal::SetChangedByUser(true); |
| 158 |
|
164 |
|
|
Lines 200-205
Link Here
|
| 200 |
// Allways modified |
206 |
// Allways modified |
| 201 |
SuSEFirewall::SetModified(); |
207 |
SuSEFirewall::SetModified(); |
| 202 |
SuSEFirewall::Write(); |
208 |
SuSEFirewall::Write(); |
|
|
209 |
// XXX: doesn't really belong here |
| 210 |
/* enable sshd if the user either opened the ssh port or if |
| 211 |
* we're using a remote install via ssh or vnc (bnc#535206) */ |
| 212 |
if (enable_ssh || Linuxrc::usessh() || Linuxrc::vnc()) { |
| 213 |
Service::Enable("sshd"); |
| 214 |
} |
| 203 |
} |
215 |
} |
| 204 |
/* unknown function */ |
216 |
/* unknown function */ |
| 205 |
else { |
217 |
else { |