Author: rhafer Date: Wed Aug 13 13:38:44 2008 New Revision: 50014 URL: http://svn.opensuse.org/viewcvs/yast?rev=50014&view=rev Log: - add yast.schema by default - Only call to YaST::YCP::Integer for checkpoint settings - use cn=Administrator as default rootdn Modified: trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/agent/SlapdConfigAgent.cc Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?rev=50014&r1=50013&r2=50014&view=diff ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Wed Aug 13 13:38:44 2008 @@ -963,8 +963,6 @@ my $defaults = shift; $defaults->{'serviceEnabled'} = YaST::YCP::Boolean($defaults->{'serviceEnabled'}); $defaults->{'slpRegister'} = YaST::YCP::Boolean($defaults->{'slpRegister'}); - $defaults->{'checkpoint'} = [ YaST::YCP::Integer($defaults->{'checkpoint'}->[0]), - YaST::YCP::Integer($defaults->{'checkpoint'}->[1]) ]; y2milestone("SetInitialDefaults: ". Data::Dumper->Dump([$defaults])); %dbDefaults = %$defaults; return 1; @@ -994,15 +992,13 @@ y2milestone("suffix: $basedn"); $dbDefaults{'suffix'} = $basedn; $dbDefaults{'directory'} = "/var/lib/ldap"; - $dbDefaults{'rootdn'} = "cn=admin,".$basedn; + $dbDefaults{'rootdn'} = "cn=Administrator,".$basedn; $dbDefaults{'rootpw'} = ""; $dbDefaults{'rootpw_clear'} = ""; $dbDefaults{'pwenctype'} = "SSHA"; $dbDefaults{'entrycache'} = 10000; $dbDefaults{'idlcache'} = 30000; - $dbDefaults{'checkpoint'} = [ YaST::YCP::Integer(1024), - YaST::YCP::Integer(5) ]; - + $dbDefaults{'checkpoint'} = [ 1024, 5 ]; $dbDefaults{'defaultIndex'} = YaST::YCP::Boolean(1); $dbDefaults{'serviceEnabled'} = YaST::YCP::Boolean(0); $dbDefaults{'slpRegister'} = YaST::YCP::Boolean(0); @@ -1043,7 +1039,10 @@ 'directory' => '/var/lib/ldap', 'entrycache' => YaST::YCP::Integer($dbDefaults{'entrycache'}), 'idlcache' => YaST::YCP::Integer($dbDefaults{'idlcache'}), - 'checkpoint' => $dbDefaults{'checkpoint'} }; + 'checkpoint' => [ YaST::YCP::Integer($dbDefaults{'checkpoint'}->[0]), + YaST::YCP::Integer($dbDefaults{'checkpoint'}->[1]) ] + }; + my $cfgdatabase = { 'type' => 'config', 'rootdn' => 'cn=config' }; my $frontenddb = { 'type' => 'frontend', @@ -1086,6 +1085,13 @@ $self->SetError( $err->{'summary'}, $err->{'description'} ); return $rc; } + $rc = SCR->Write(".ldapserver.schema.addFromSchemafile", "/etc/openldap/schema/yast.schema" ); + if ( ! $rc ) { + my $err = SCR->Error(".ldapserver"); + y2error("Adding Schema failed: ".$err->{'summary'}." ".$err->{'description'}); + $self->SetError( $err->{'summary'}, $err->{'description'} ); + return $rc; + } SCR->Execute('.ldapserver.initDatabases', [ $frontenddb, $cfgdatabase, $database ] ); if ( $dbDefaults{'defaultIndex'} == 1 ) Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfigAgent.cc?rev=50014&r1=50013&r2=50014&view=diff ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Wed Aug 13 13:38:44 2008 @@ -285,6 +285,8 @@ else if (std::string("checkpoint") == j.key()->asString()->value_cstr() ) { YCPList cpList = j.value()->asList(); + y2milestone("cp 0: %s", cpList->value(0)->valuetype_str() ); + y2milestone("cp 1: %s", cpList->value(1)->valuetype_str() ); bdb->setCheckPoint( cpList->value(0)->asInteger()->value(), cpList->value(1)->asInteger()->value() ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org