Author: rhafer
Date: Thu Jul 31 17:15:29 2008
New Revision: 49554
URL: http://svn.opensuse.org/viewcvs/yast?rev=49554&view=rev
Log:
Fixed firewall settings
Modified:
trunk/ldap-server/src/LdapServer.pm
trunk/ldap-server/src/dialogs.ycp
trunk/ldap-server/src/tree_structure.ycp
Modified: trunk/ldap-server/src/LdapServer.pm
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?rev=49554&r1=49553&r2=49554&view=diff
==============================================================================
--- trunk/ldap-server/src/LdapServer.pm (original)
+++ trunk/ldap-server/src/LdapServer.pm Thu Jul 31 17:15:29 2008
@@ -26,6 +26,7 @@
our %TYPEINFO;
YaST::YCP::Import ("Progress");
+YaST::YCP::Import ("SuSEFirewall");
YaST::YCP::Import ("Service");
my %error = ( msg => undef, details => undef );
@@ -141,6 +142,7 @@
sub Read {
y2milestone("");
+ SuSEFirewall->Read();
my $progressItems = [ "Reading Startup Configuration",
"Reading Configuration Backend",
"Reading Configuration Data" ];
@@ -346,7 +348,7 @@
{
SCR->Write('.sysconfig.openldap.OPENLDAP_START_LDAPS', 'no');
}
-
+ SuSEFirewall->Write();
my $wasEnabled = Service->Enabled("ldap");
if ( !$wasEnabled && $serviceEnabled )
{
@@ -475,6 +477,7 @@
return 0;
}
Progress->Finish();
+ SuSEFirewall->Write();
} else {
my $wasEnabled = Service->Enabled("ldap");
if ( $wasEnabled && !$serviceEnabled )
@@ -519,6 +522,7 @@
SCR->Write('.sysconfig.openldap.OPENLDAP_START_LDAPS', 'no');
}
+ SuSEFirewall->Write();
if( ! SCR->Execute('.ldapserver.commitChanges' ) )
{
my $err = SCR->Error(".ldapserver");
Modified: trunk/ldap-server/src/dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/dialogs.ycp?rev=49554&r1=49553&r2=49554&view=diff
==============================================================================
--- trunk/ldap-server/src/dialogs.ycp (original)
+++ trunk/ldap-server/src/dialogs.ycp Thu Jul 31 17:15:29 2008
@@ -184,7 +184,9 @@
`VBox(
`Frame( _("Firewall Settings"),
`VBox(
- fw_widget["custom_widget"]:`Empty(),
+ `ReplacePoint( `id( `rp_firewall ),
+ `Empty()
+ ),
`HStretch()
)
)
@@ -201,8 +203,12 @@
map