Author: rhafer Date: Wed Oct 1 14:06:34 2008 New Revision: 51738 URL: http://svn.opensuse.org/viewcvs/yast?rev=51738&view=rev Log: create temporary service file for the Firewall-Widget to work (bnc#428364) Modified: trunk/ldap-server/src/dialogs.ycp trunk/ldap-server/src/ldap-server_proposal.ycp Modified: trunk/ldap-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/dialogs.ycp?rev=51738&r1=51737&r2=51738&view=diff ============================================================================== --- trunk/ldap-server/src/dialogs.ycp (original) +++ trunk/ldap-server/src/dialogs.ycp Wed Oct 1 14:06:34 2008 @@ -194,7 +194,7 @@ { map <string, any> defaults = LdapServer::CreateInitialDefaults(); map<string, any> firewall_settings = $[ - "services": [ "ldap" , "ldaps" ], + "services": [ "service:openldap" ], "display_details": true, ]; map<string, any> firewall_widget = Modified: trunk/ldap-server/src/ldap-server_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/ldap-server_proposal.ycp?rev=51738&r1=51737&r2=51738&view=diff ============================================================================== --- trunk/ldap-server/src/ldap-server_proposal.ycp (original) +++ trunk/ldap-server/src/ldap-server_proposal.ycp Wed Oct 1 14:06:34 2008 @@ -59,6 +59,12 @@ { y2milestone ("Openldap2 is not installed. --> service disabled"); LdapServer::WriteServiceEnabled (false); + // temporarly create the services file for the Firewallsettings + if (SCR::Read(.target.size, "/etc/sysconfig/SuSEfirewall2.d/services/openldap") <= 0) + { + SCR::Write(.target.string, "/etc/sysconfig/SuSEfirewall2.d/services/openldap", + "TCP=\"ldap ldaps\"\nUDP=\"ldap\"\n" ); + } } else { @@ -101,7 +107,7 @@ y2milestone("Zones used by firewall: %1", used_zones); foreach (string zone, used_zones, { - if (SuSEFirewall::IsServiceSupportedInZone ("ldap", zone)) + if (SuSEFirewall::IsServiceSupportedInZone ("service:openldap", zone)) is_ldap_enabled = true; }); } @@ -179,6 +185,11 @@ else if(func == "Write") { if( LdapServer::Configured() ) return ret; + if (!Package::Installed ("openldap2")) + { + //remove temp file + SCR::Execute(.target.remove, "/etc/sysconfig/SuSEfirewall2.d/services/openldap"); + } if( LdapServer::ReadServiceEnabled() ) { /* ensure openldap2 package is installed */ -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org