Author: rhafer Date: Tue Jul 6 13:28:21 2010 New Revision: 62184

URL: http://svn.opensuse.org/viewcvs/yast?rev=62184&view=rev Log: Fixes for bnc#619549 and bnc#615805 from trunk

Modified: branches/SuSE-Linux-11_3-Branch/ldap-server/ (props changed) branches/SuSE-Linux-11_3-Branch/ldap-server/src/LdapDatabase.ycp branches/SuSE-Linux-11_3-Branch/ldap-server/src/LdapServer.pm branches/SuSE-Linux-11_3-Branch/ldap-server/src/dialogs.ycp branches/SuSE-Linux-11_3-Branch/ldap-server/src/ldap-server_proposal.ycp

Modified: branches/SuSE-Linux-11_3-Branch/ldap-server/src/LdapDatabase.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/ldap-se... ============================================================================== --- branches/SuSE-Linux-11_3-Branch/ldap-server/src/LdapDatabase.ycp (original) +++ branches/SuSE-Linux-11_3-Branch/ldap-server/src/LdapDatabase.ycp Tue Jul 6 13:28:21 2010 @@ -148,7 +148,7 @@ boolean append_checked = true; if ( createDefaults ) { - db = LdapServer::ReadInitialDefaults(); + db = LdapServer::CreateInitialDefaults(); } else {

Modified: branches/SuSE-Linux-11_3-Branch/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/ldap-se... ============================================================================== --- branches/SuSE-Linux-11_3-Branch/ldap-server/src/LdapServer.pm (original) +++ branches/SuSE-Linux-11_3-Branch/ldap-server/src/LdapServer.pm Tue Jul 6 13:28:21 2010 @@ -811,6 +811,13 @@ ["localhost"]); SCR->Write(".etc.ldap_conf.value."/etc/openldap/ldap.conf".base", [$ldapconf_base]); + my $tls = $self->ReadTlsConfig(); + if ( ref($tls) eq "HASH" && $tls->{'caCertFile'} ne "" ) + { + SCR->Write(".etc.ldap_conf.value."/etc/openldap/ldap.conf".tls_cacert", + [$tls->{'caCertFile'}]); + } + SCR->Write(".etc.ldap_conf", "force" ); } if (! $usesBackConfig ) { @@ -1570,10 +1577,10 @@ # # @return A Map containing the setting to use when creating the initial setup # -BEGIN { $TYPEINFO {ReadInitialDefaults} = ["function", [ "map", "string", "any"] ]; } -sub ReadInitialDefaults +BEGIN { $TYPEINFO {CreateInitialDefaults} = ["function", [ "map", "string", "any"] ]; } +sub CreateInitialDefaults { - y2milestone("ReadInitialDefaults"); + y2milestone("CreateInitialDefaults"); my $self = shift; if ( ! keys(%dbDefaults ) ) { $self->InitDbDefaults(); @@ -1759,6 +1766,7 @@ $self->ChangeDatabaseIndex(1, $idx ); } } + $self->WriteLdapConfBase($database->{'suffix'});

if ( defined $dbDefaults{'configpw'} && $dbDefaults{'configpw'} ne "" ) {

Modified: branches/SuSE-Linux-11_3-Branch/ldap-server/src/dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/ldap-se... ============================================================================== --- branches/SuSE-Linux-11_3-Branch/ldap-server/src/dialogs.ycp (original) +++ branches/SuSE-Linux-11_3-Branch/ldap-server/src/dialogs.ycp Tue Jul 6 13:28:21 2010 @@ -206,7 +206,7 @@

any EnableServiceDialog() { - map <string, any> defaults = LdapServer::ReadInitialDefaults(); + map <string, any> defaults = LdapServer::CreateInitialDefaults(); map<string, any> firewall_settings = $[ "services": [ "service:openldap" ], "display_details": true, @@ -1075,7 +1075,7 @@ } else { - map <string, any> defaults = LdapServer::ReadInitialDefaults(); + map <string, any> defaults = LdapServer::CreateInitialDefaults(); defaults["configpw"] = pw; LdapServer::SetInitialDefaults(defaults); break;

Modified: branches/SuSE-Linux-11_3-Branch/ldap-server/src/ldap-server_proposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Linux-11_3-Branch/ldap-se... ============================================================================== --- branches/SuSE-Linux-11_3-Branch/ldap-server/src/ldap-server_proposal.ycp (original) +++ branches/SuSE-Linux-11_3-Branch/ldap-server/src/ldap-server_proposal.ycp Tue Jul 6 13:28:21 2010 @@ -73,7 +73,7 @@ { LdapServer::WriteServiceEnabled( true ); } - defaults = LdapServer::ReadInitialDefaults(); + defaults = LdapServer::CreateInitialDefaults(); defaults["serviceEnabled"] = LdapServer::ReadServiceEnabled(); defaults["rootpw_clear"] = Users::GetRootPassword(); LdapServer::SetInitialDefaults(defaults); @@ -86,7 +86,7 @@ if( LdapServer::ReadServiceEnabled() ) { string rootPWString = ""; - defaults = LdapServer::ReadInitialDefaults(); + defaults = LdapServer::CreateInitialDefaults(); if (! LdapServer::ReadSetupSlave() ) { if( defaults["rootpw_clear"]:"" == Users::GetRootPassword() ) @@ -250,7 +250,7 @@ } } LdapServer::ReadFromDefaults(); - map <string,any> defaults = LdapServer::ReadInitialDefaults(); + map <string,any> defaults = LdapServer::CreateInitialDefaults(); Progress::set(false); Ldap::Read(); Progress::set(true);