Author: rhafer
Date: Tue Jul 6 12:14:31 2010
New Revision: 62183
URL: http://svn.opensuse.org/viewcvs/yast?rev=62183&view=rev
Log:
- Write CA cert option to ldap.conf (bnc#619549)
- Rename ReadInitialDefaults() back to CreateInitialDefaults()
to stay backwards compatible. (bnc#615805)
Modified:
trunk/ldap-server/src/LdapDatabase.ycp
trunk/ldap-server/src/LdapServer.pm
trunk/ldap-server/src/dialogs.ycp
trunk/ldap-server/src/ldap-server_proposal.ycp
Modified: trunk/ldap-server/src/LdapDatabase.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapDatabase.ycp?rev=62183&r1=62182&r2=62183&view=diff
==============================================================================
--- trunk/ldap-server/src/LdapDatabase.ycp (original)
+++ trunk/ldap-server/src/LdapDatabase.ycp Tue Jul 6 12:14:31 2010
@@ -148,7 +148,7 @@
boolean append_checked = true;
if ( createDefaults )
{
- db = LdapServer::ReadInitialDefaults();
+ db = LdapServer::CreateInitialDefaults();
}
else
{
Modified: trunk/ldap-server/src/LdapServer.pm
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?rev=62183&r1=62182&r2=62183&view=diff
==============================================================================
--- trunk/ldap-server/src/LdapServer.pm (original)
+++ trunk/ldap-server/src/LdapServer.pm Tue Jul 6 12:14:31 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: trunk/ldap-server/src/dialogs.ycp
URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/dialogs.ycp?rev=62183&r1=62182&r2=62183&view=diff
==============================================================================
--- trunk/ldap-server/src/dialogs.ycp (original)
+++ trunk/ldap-server/src/dialogs.ycp Tue Jul 6 12:14:31 2010
@@ -206,7 +206,7 @@
any EnableServiceDialog()
{
- map