Author: locilka
Date: Fri Aug 26 13:30:56 2011
New Revision: 65399
URL: http://svn.opensuse.org/viewcvs/yast?rev=65399&view=rev
Log:
- Fixed handling of FW_SERVICES_ACCEPT_* in SuSEFirewall modules to
understand flags as the fifth parameter (bnc#712670)
- Fixed SuSEfirewall2 SCR agent to parse the sysconfig file
properly (bnc#712670)
Modified:
branches/SuSE-Code-11-SP1-Branch/yast2/library/network/agents/sysconfig_SuSEfirewall2.scr
branches/SuSE-Code-11-SP1-Branch/yast2/library/network/src/SuSEFirewall.ycp
branches/SuSE-Code-11-SP1-Branch/yast2/library/network/src/SuSEFirewallExpertRules.ycp
branches/SuSE-Code-11-SP1-Branch/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.out
branches/SuSE-Code-11-SP1-Branch/yast2/library/network/testsuite/tests/SuSEFirewallExpertRules.ycp
branches/SuSE-Code-11-SP1-Branch/yast2/package/yast2.changes
Modified: branches/SuSE-Code-11-SP1-Branch/yast2/library/network/agents/sysconfig_SuSEfirewall2.scr
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2/library/network/agents/sysconfig_SuSEfirewall2.scr?rev=65399&r1=65398&r2=65399&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/yast2/library/network/agents/sysconfig_SuSEfirewall2.scr (original)
+++ branches/SuSE-Code-11-SP1-Branch/yast2/library/network/agents/sysconfig_SuSEfirewall2.scr Fri Aug 26 13:30:56 2011
@@ -33,6 +33,12 @@
"comments": [ "^[ \t]*#.*$", "#.*", "^[ \t]*$", ],
"params" : [
$[
+ // with quotes
+ "match" : [ "^[ \t]*([_a-zA-Z0-9]+)[ \t]*=[ \t]*\"(.*)\"[ \t]*$", "%s=\"%s\"" ],
+ // without quotes
+ "match" : [ "^[ \t]*([_a-zA-Z0-9]+)[ \t]*=[ \t]*([^\"]*)[ \t]*$", "%s=\"%s\"" ],
+ ],
+ $[
"match" : [ "([a-zA-Z0-9_]+)[ \t]*=[ \t]*\"([^\"]*)\"", "%s=\"%s\"" ],
"multiline" : [ "([a-zA-Z0-9_]+)[ \t]*=[ \t]*\"([^\"]*)", "([^\"]*)\"", ],
],
@@ -41,9 +47,6 @@
"match" : [ "([a-zA-Z0-9_]+)[ \t]*=[ \t]*'([^']*)'", "%s=\"%s\"" ],
"multiline" : [ "([a-zA-Z0-9_]+)[ \t]*=[ \t]*'([^']*)", "([^\']*)'", ],
],
- $[
- "match" : [ "([a-zA-Z0-9_]+)[ \t]*=[ \t]*([^\"]*[^ \t\"]|)[ \t]*$", "%s=\"%s\"",],
- ],
],
]
)
Modified: branches/SuSE-Code-11-SP1-Branch/yast2/library/network/src/SuSEFirewall.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2/library/network/src/SuSEFirewall.ycp?rev=65399&r1=65398&r2=65399&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/yast2/library/network/src/SuSEFirewall.ycp (original)
+++ branches/SuSE-Code-11-SP1-Branch/yast2/library/network/src/SuSEFirewall.ycp Fri Aug 26 13:30:56 2011
@@ -299,7 +299,8 @@
void ReadSysconfigSuSEFirewall (list<string> variables) {
foreach (string variable, variables, {
string value = (string) SCR::Read(add(.sysconfig.SuSEfirewall2,variable));
- // if variable is undefined, get default value
+
+ // if value is undefined, get default value
if (value == nil || value == "")
value = GetDefaultValue(variable);
@@ -364,14 +365,14 @@
);
if (! write_status) {
- Report::Error(Message::CannotWriteSettingsTo("/etc/sysconfig/SuSEFirewall"));
+ Report::Error(Message::CannotWriteSettingsTo("/etc/sysconfig/SuSEFirewall2"));
break;
}
});
write_status = SCR::Write(.sysconfig.SuSEfirewall2, nil);
if (! write_status) {
- Report::Error(Message::CannotWriteSettingsTo("/etc/sysconfig/SuSEFirewall"));
+ Report::Error(Message::CannotWriteSettingsTo("/etc/sysconfig/SuSEFirewall2"));
}
return write_status;
Modified: branches/SuSE-Code-11-SP1-Branch/yast2/library/network/src/SuSEFirewallExpertRules.ycp
URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP1-Branch/yast2/library/network/src/SuSEFirewallExpertRules.ycp?rev=65399&r1=65398&r2=65399&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP1-Branch/yast2/library/network/src/SuSEFirewallExpertRules.ycp (original)
+++ branches/SuSE-Code-11-SP1-Branch/yast2/library/network/src/SuSEFirewallExpertRules.ycp Fri Aug 26 13:30:56 2011
@@ -187,7 +187,7 @@
//
// FW_SERVICES_ACCEPT_EXT, FW_SERVICES_ACCEPT_INT, FW_SERVICES_ACCEPT_DMZ
- // Format: space separated list of net,protocol[,dport][,sport]
+ // Format: space separated list of net,protocol[,dport][,sport][,other-comma-separated-options]
//
list
