Author: locilka Date: Tue Jan 22 14:59:45 2008 New Revision: 43821 URL: http://svn.opensuse.org/viewcvs/yast?rev=43821&view=rev Log: - Fixed SuSEFirewall testsuite and possibly conflicting services. Modified: trunk/yast2/library/network/src/SuSEFirewallServices.ycp trunk/yast2/library/network/testsuite/tests/SuSEFirewall.out trunk/yast2/library/network/testsuite/tests/SuSEFirewall.ycp trunk/yast2/package/yast2.changes Modified: trunk/yast2/library/network/src/SuSEFirewallServices.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/src/SuSEFirewallServices.ycp?rev=43821&r1=43820&r2=43821&view=diff ============================================================================== --- trunk/yast2/library/network/src/SuSEFirewallServices.ycp (original) +++ trunk/yast2/library/network/src/SuSEFirewallServices.ycp Tue Jan 22 14:59:45 2008 @@ -30,7 +30,7 @@ // FIXME: repair by implementing FATE #300687: Ports for SuSEfirewall added via packages. // add definition of services to the respective package /* list of possibly conflict services because of sharing ports, for instance: "nis-server" and "nfs-server" */ - list <string> possibly_conflict_services = ["nfs-server", "nis-server", "nfs-client", "nis-client"]; + list <string> possibly_conflict_services = ["nfs-server", "nis-server", "nfs-client"]; /*** * Names assigned to Port and Protocol numbers can be found Modified: trunk/yast2/library/network/testsuite/tests/SuSEFirewall.out URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/testsuite/tests/SuSEFirewall.out?rev=43821&r1=43820&r2=43821&view=diff ============================================================================== --- trunk/yast2/library/network/testsuite/tests/SuSEFirewall.out (original) +++ trunk/yast2/library/network/testsuite/tests/SuSEFirewall.out Tue Jan 22 14:59:45 2008 @@ -51,12 +51,7 @@ Return no Return yes Dump -Dump == Services handling 1 == -Return false -Return nil -Return true -Dump -Dump == Services handling 2 == +Dump == Services handling == Return nil Return nil Dump @@ -68,7 +63,7 @@ Return false Dump Dump == Broadcast handling == -Return $["DMZ":["bootps"], "EXT":["bootps"], "INT":[]] +Return $["DMZ":[], "EXT":[], "INT":[]] Return nil Return $["DMZ":["5", "3", "1"], "EXT":["22", "33", "44"], "INT":[]] Dump Modified: trunk/yast2/library/network/testsuite/tests/SuSEFirewall.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/library/network/testsuite/tests/SuSEFirewall.ycp?rev=43821&r1=43820&r2=43821&view=diff ============================================================================== --- trunk/yast2/library/network/testsuite/tests/SuSEFirewall.ycp (original) +++ trunk/yast2/library/network/testsuite/tests/SuSEFirewall.ycp Tue Jan 22 14:59:45 2008 @@ -178,13 +178,7 @@ TEST(``(SuSEFirewall::GetIgnoreLoggingBroadcast("DMZ")), [READ, WRITE, EXECUTE], nil); DUMP(""); - DUMP("== Services handling 1 =="); - TEST(``(SuSEFirewall::IsServiceSupportedInZone ("dhcp-server", "EXT")), [READ, WRITE, EXECUTE], nil); - TEST(``(SuSEFirewall::SetServicesForZones (["dhcp-server","imaps"], ["EXT","DMZ"], true)), [READ, WRITE, EXECUTE], nil); - TEST(``(SuSEFirewall::IsServiceSupportedInZone ("dhcp-server", "EXT")), [READ, WRITE, EXECUTE], nil); - - DUMP(""); - DUMP("== Services handling 2 =="); + DUMP("== Services handling =="); // needs a better testsuite for SuSEFirewallServices module // these services are not known TEST(``(SuSEFirewall::IsServiceSupportedInZone ("service:aaa-bbb", "EXT")), [READ, WRITE, EXECUTE], nil); Modified: trunk/yast2/package/yast2.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/yast2/package/yast2.changes?rev=43821&r1=43820&r2=43821&view=diff ============================================================================== --- trunk/yast2/package/yast2.changes (original) +++ trunk/yast2/package/yast2.changes Tue Jan 22 14:59:45 2008 @@ -14,6 +14,7 @@ - Disabled also SSH, DHCP server/client, NIS client. - Function GetFilenameFromServiceDefinedByPackage has been made global. +- Fixed SuSEFirewall testsuite and possibly conflicting services. ------------------------------------------------------------------- Fri Jan 18 18:04:57 CET 2008 - kmachalkova@suse.cz -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org