Author: varkoly
Date: Tue May 20 18:08:22 2008
New Revision: 47723
URL: http://svn.opensuse.org/viewcvs/yast?rev=47723&view=rev
Log:
mak ldap setup safer
Modified:
trunk/mail/src/MailServerLDAP.pm
trunk/mail/src/mail-server_ldap-setup.ycp
trunk/mail/src/mail.ycp
Modified: trunk/mail/src/MailServerLDAP.pm
URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/MailServerLDAP.pm?rev=47723&r1=47722&r2=47723&view=diff
==============================================================================
--- trunk/mail/src/MailServerLDAP.pm (original)
+++ trunk/mail/src/MailServerLDAP.pm Tue May 20 18:08:22 2008
@@ -33,10 +33,10 @@
YaST::YCP::Import ("YaPI::LdapServer");
YaST::YCP::Import ("Service");
-BEGIN {$TYPEINFO{ConfigureLDAPServer} = ["function", "any"];}
+BEGIN {$TYPEINFO{ConfigureLDAPServer} = ["function", [ "map" , "string", "any" ] ];}
sub ConfigureLDAPServer()
{
- my $ldapMap = YaPI::LdapServer->ReadDatabaseList();
+ my $ldapMap = YaPI::LdapServer->ReadDatabaseList();
# Now we configure the LDAP-Server to be able store the mail server configuration
my $schemas = YaPI::LdapServer->ReadSchemaIncludeList();
my $SCHEMA = join "",@{$schemas};
@@ -91,4 +91,5 @@
}
YaPI::LdapServer->RecreateIndex($ldapMap->[0]);
Service->Restart("ldap");
+ return YaPI::LdapServer->ReadDatabase($ldapMap->[0]);
}
Modified: trunk/mail/src/mail-server_ldap-setup.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail-server_ldap-setup.ycp?rev=47723&r1=47722&r2=47723&view=diff
==============================================================================
--- trunk/mail/src/mail-server_ldap-setup.ycp (original)
+++ trunk/mail/src/mail-server_ldap-setup.ycp Tue May 20 18:08:22 2008
@@ -85,7 +85,11 @@
}
if(contains(args,"local"))
{
- MailServerLDAP::ConfigureLDAPServer();
+ map