[yast-commit] r47723 - in /trunk/mail/src: MailServerLDAP.pm mail-server_ldap-setup.ycp mail.ycp

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 LDB = MailServerLDAP::ConfigureLDAPServer(); + SCR::Write(.sysconfig.ldap.BASE_CONFIG_DN,LDB["suffix"]); + SCR::Write(.sysconfig.ldap.BIND_DN,LDB["rootdn"]:""); + SCR::Write(.sysconfig.ldap.BIND_DN,LDB["rootdn"]:""); + SCR::Write(.sysconfig.ldap,nil); } return true; } Modified: trunk/mail/src/mail.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/mail/src/mail.ycp?rev=47723&r1=47722&r2=47723&view=diff ============================================================================== --- trunk/mail/src/mail.ycp (original) +++ trunk/mail/src/mail.ycp Tue May 20 18:08:22 2008 @@ -71,8 +71,8 @@ string caption = _("E-Mail Server Configuration"); term tskip_ask = `Left(`CheckBox(`id(`skip_ask), _("Skip this page in the future"))); string status = _("Mail server is not configured.")+"\n"+ - _("Select configuration type according your personal needs")+ - _("If you want to use <b>sendmail</b> as MTA you have to use <b>Standard</b> configuration."); + _("Select configuration type according your personal needs")+"\n"+ + _("If you want to use sendmail as MTA you have to use Standard configuration."); if( first ) { tskip_ask = `VSpacing(1); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org