Author: locilka Date: Mon Jul 2 15:18:58 2007 New Revision: 39104 URL: http://svn.opensuse.org/viewcvs/yast?rev=39104&view=rev Log: - Fixed adding of firewall custom rules in case of empty destination port but source port set (#284998). Modified: trunk/yast2/library/network/src/SuSEFirewallExpertRules.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/network/src/SuSEFirewallExpertRules.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/SuSEFir... ============================================================================== --- trunk/yast2/library/network/src/SuSEFirewallExpertRules.ycp (original) +++ trunk/yast2/library/network/src/SuSEFirewallExpertRules.ycp Mon Jul 2 15:18:58 2007 @@ -244,8 +244,17 @@ // Creating new record string new_rule = params["network"]:"" + "," + params["protocol"]:""; - if (params["dport"]:"" != "") new_rule = new_rule + "," + params["dport"]:""; - if (params["sport"]:"" != "") new_rule = new_rule + "," + params["sport"]:""; + + // either 'dport' or 'sport' + if (params["dport"]:"" != "" || params["sport"]:"" != "") { + // 'dport' can be empty even if 'sport' is set + new_rule = new_rule + "," + params["dport"]:""; + + if (params["sport"]:"" != "") { + new_rule = new_rule + "," + params["sport"]:""; + } + } + if (new_rule == "0/0,all") { y2warning("Adding rule '%1' that allows everything from all networks!", new_rule); } Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=3... ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Mon Jul 2 15:18:58 2007 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Mon Jul 2 15:16:20 CEST 2007 - locilka@suse.cz + +- Fixed adding of firewall custom rules in case of empty + destination port but source port set (#284998). + +------------------------------------------------------------------- Thu Jun 28 21:33:42 CEST 2007 - jsrain@suse.cz - added mode for live CD installation -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org