Hello community, here is the log from the commit of package yast2-auth-server for openSUSE:Factory checked in at 2014-06-18 07:50:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-auth-server (Old) and /work/SRC/openSUSE:Factory/.yast2-auth-server.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-auth-server" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-auth-server/yast2-auth-server.changes 2014-06-02 07:00:27.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.yast2-auth-server.new/yast2-auth-server.changes 2014-06-18 07:52:46.000000000 +0200 @@ -1,0 +2,7 @@ +Sun Jun 8 06:24:03 UTC 2014 - [email protected] + +- bnc#881516 - OpenLDAP server mdb integration missing in yast +- bnc#881631 - YaST Module MirrorMode crash +- 3.1.9 + +------------------------------------------------------------------- Old: ---- yast2-auth-server-3.1.8.tar.bz2 New: ---- yast2-auth-server-3.1.9.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-auth-server.spec ++++++ --- /var/tmp/diff_new_pack.TfKE7i/_old 2014-06-18 07:52:46.000000000 +0200 +++ /var/tmp/diff_new_pack.TfKE7i/_new 2014-06-18 07:52:46.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-auth-server -Version: 3.1.8 +Version: 3.1.9 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build ++++++ yast2-auth-server-3.1.8.tar.bz2 -> yast2-auth-server-3.1.9.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-auth-server-3.1.8/agent/SlapdConfigAgent.cc new/yast2-auth-server-3.1.9/agent/SlapdConfigAgent.cc --- old/yast2-auth-server-3.1.8/agent/SlapdConfigAgent.cc 2014-05-28 11:45:48.000000000 +0200 +++ new/yast2-auth-server-3.1.9/agent/SlapdConfigAgent.cc 2014-06-09 09:20:31.000000000 +0200 @@ -303,7 +303,7 @@ std::string dbtype(dbMap->value(YCPString("type"))->asString()->value_cstr()); y2milestone("Database Type: %s", dbtype.c_str()); boost::shared_ptr<OlcDatabase> db; - if ( dbtype == "bdb" || dbtype == "hdb" ) + if ( dbtype == "bdb" || dbtype == "hdb" || dbtype == "mdb" ) { db = boost::shared_ptr<OlcDatabase>(new OlcBdbDatabase(dbtype) ); } @@ -333,7 +333,7 @@ db->setRootPw( j->second->asString()->value_cstr() ); continue; } - if ( dbtype == "bdb" || dbtype == "hdb" ) + if ( dbtype == "bdb" || dbtype == "hdb" || dbtype == "mdb" ) { boost::shared_ptr<OlcBdbDatabase> bdb = boost::dynamic_pointer_cast<OlcBdbDatabase>(db); @@ -341,11 +341,11 @@ { bdb->setDirectory( j->second->asString()->value_cstr() ); } - else if (std::string("entrycache") == j->first->asString()->value_cstr() ) + else if (std::string("entrycache") == j->first->asString()->value_cstr() && dbtype != "mdb" ) { bdb->setEntryCache( j->second->asInteger()->value() ); } - else if (std::string("idlcache") == j->first->asString()->value_cstr() ) + else if (std::string("idlcache") == j->first->asString()->value_cstr() && dbtype != "mdb" ) { bdb->setIdlCache( j->second->asInteger()->value() ); } @@ -704,16 +704,19 @@ YCPString( (*i)->getStringValue("olcRootDn") )); resMap.add( YCPString("rootpw"), YCPString( (*i)->getStringValue("olcRootPw") )); - if ( dbtype == "bdb" || dbtype == "hdb" ) + if ( dbtype == "bdb" || dbtype == "hdb" || dbtype == "mdb" ) { boost::shared_ptr<OlcBdbDatabase> bdb = boost::dynamic_pointer_cast<OlcBdbDatabase>(*i); resMap.add( YCPString("directory"), YCPString( bdb->getStringValue("olcDbDirectory") )); - resMap.add( YCPString("entrycache"), - YCPInteger( bdb->getEntryCache() )); - resMap.add( YCPString("idlcache"), - YCPInteger( bdb->getIdlCache() )); + if( dbtype != "mdb" ) + { + resMap.add( YCPString("entrycache"), + YCPInteger( bdb->getEntryCache() )); + resMap.add( YCPString("idlcache"), + YCPInteger( bdb->getIdlCache() )); + } YCPList checkPoint; int kbytes, min; bdb->getCheckPoint(kbytes, min); @@ -1348,7 +1351,7 @@ y2milestone("Database will get Index: %d", dbIndex); std::string dbtype(dbMap->value(YCPString("type"))->asString()->value_cstr()); boost::shared_ptr<OlcDatabase> db; - if ( dbtype == "bdb" || dbtype == "hdb" ) + if ( dbtype == "bdb" || dbtype == "hdb" || dbtype == "mdb" ) { db = boost::shared_ptr<OlcDatabase>(new OlcBdbDatabase( dbtype ) ); } @@ -1378,7 +1381,7 @@ db->setRootPw( j->second->asString()->value_cstr() ); continue; } - if ( dbtype == "bdb" || dbtype == "hdb" ) + if ( dbtype == "bdb" || dbtype == "hdb" || dbtype == "mdb" ) { boost::shared_ptr<OlcBdbDatabase> bdb = boost::dynamic_pointer_cast<OlcBdbDatabase>(db); @@ -1386,11 +1389,11 @@ { bdb->setDirectory( j->second->asString()->value_cstr() ); } - else if (std::string("entrycache") == j->first->asString()->value_cstr() ) + else if (std::string("entrycache") == j->first->asString()->value_cstr() && dbtype != "mdb" ) { bdb->setEntryCache( j->second->asInteger()->value() ); } - else if (std::string("idlcache") == j->first->asString()->value_cstr() ) + else if (std::string("idlcache") == j->first->asString()->value_cstr() && dbtype != "mdb" ) { bdb->setIdlCache( j->second->asInteger()->value() ); } @@ -1501,20 +1504,23 @@ (*i)->setStringValue("olcSecurity", newVal ); } } - if ( (*i)->getType() == "bdb" || (*i)->getType() == "hdb" ) + if ( (*i)->getType() == "bdb" || (*i)->getType() == "hdb" || (*i)->getType() == "mdb" ) { boost::shared_ptr<OlcBdbDatabase> bdb = boost::dynamic_pointer_cast<OlcBdbDatabase>(*i); - val = dbMap.value( YCPString("entrycache") ); - if ( ! val.isNull() && val->isInteger() ) - { - bdb->setEntryCache( val->asInteger()->value() ); - } - val = dbMap.value( YCPString("idlcache") ); - if ( ! val.isNull() && val->isInteger() ) - { - bdb->setIdlCache( val->asInteger()->value() ); - } + if( (*i)->getType() != "mdb" ) + { + val = dbMap.value( YCPString("entrycache") ); + if ( ! val.isNull() && val->isInteger() ) + { + bdb->setEntryCache( val->asInteger()->value() ); + } + val = dbMap.value( YCPString("idlcache") ); + if ( ! val.isNull() && val->isInteger() ) + { + bdb->setIdlCache( val->asInteger()->value() ); + } + } val = dbMap.value( YCPString("checkpoint") ); if ( ! val.isNull() && val->isList() ) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-auth-server-3.1.8/lib/slapd-config.cpp new/yast2-auth-server-3.1.9/lib/slapd-config.cpp --- old/yast2-auth-server-3.1.8/lib/slapd-config.cpp 2014-05-28 11:45:48.000000000 +0200 +++ new/yast2-auth-server-3.1.9/lib/slapd-config.cpp 2014-06-09 09:20:31.000000000 +0200 @@ -1643,7 +1643,7 @@ StringList oc = e.getAttributeByName("objectclass")->getValues(); for( StringList::const_iterator i = oc.begin(); i != oc.end(); i++ ) { - if ( strCaseIgnoreEquals(*i, "olcBdbConfig" ) || strCaseIgnoreEquals(*i, "olcHdbConfig" ) ) + if ( strCaseIgnoreEquals(*i, "olcBdbConfig" ) || strCaseIgnoreEquals(*i, "olcHdbConfig" ) || strCaseIgnoreEquals(*i, "olcMdbConfig" ) ) { return true; } @@ -1672,6 +1672,10 @@ { m_dbEntryChanged.addAttribute(LDAPAttribute("objectclass", "olcHdbConfig")); } + else if( type == "mdb" ) + { + m_dbEntryChanged.addAttribute(LDAPAttribute("objectclass", "olcMdbConfig")); + } else { m_dbEntryChanged.addAttribute(LDAPAttribute("objectclass", "olcBdbConfig")); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-auth-server-3.1.8/package/yast2-auth-server.changes new/yast2-auth-server-3.1.9/package/yast2-auth-server.changes --- old/yast2-auth-server-3.1.8/package/yast2-auth-server.changes 2014-05-28 11:45:48.000000000 +0200 +++ new/yast2-auth-server-3.1.9/package/yast2-auth-server.changes 2014-06-09 09:20:31.000000000 +0200 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Sun Jun 8 06:24:03 UTC 2014 - [email protected] + +- bnc#881516 - OpenLDAP server mdb integration missing in yast +- bnc#881631 - YaST Module MirrorMode crash +- 3.1.9 + +------------------------------------------------------------------- Wed May 28 08:54:18 UTC 2014 - [email protected] - translate some untranslated strings (bnc#880031) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-auth-server-3.1.8/package/yast2-auth-server.spec new/yast2-auth-server-3.1.9/package/yast2-auth-server.spec --- old/yast2-auth-server-3.1.8/package/yast2-auth-server.spec 2014-05-28 11:45:48.000000000 +0200 +++ new/yast2-auth-server-3.1.9/package/yast2-auth-server.spec 2014-06-09 09:20:31.000000000 +0200 @@ -17,7 +17,7 @@ Name: yast2-auth-server -Version: 3.1.8 +Version: 3.1.9 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-auth-server-3.1.8/src/include/auth-server/helps.rb new/yast2-auth-server-3.1.9/src/include/auth-server/helps.rb --- old/yast2-auth-server-3.1.8/src/include/auth-server/helps.rb 2014-05-28 11:45:48.000000000 +0200 +++ new/yast2-auth-server-3.1.9/src/include/auth-server/helps.rb 2014-06-09 09:20:31.000000000 +0200 @@ -47,11 +47,13 @@ "<h3>Basic Database Settings</h3>" ) + _( - "<p>Choose the <b>Database</b> from <b>hdb</b> and <b>bdb</b>. <b>Hdb</b> is a\n" + + "<p>Choose the <b>Database</b> from <b>hdb</b> <b>bdb</b> and <b>mdb</b>. <b>Hdb</b> is a\n" + "variant of the <b>bdb</b> backend that uses a hierarchical database layout and\n" + "supports subtree renames. Otherwise it is identical to <b>bdb</b>. A\n" + "<b>hdb</b>-Database needs a larger <b>idlcachesize</b> than a\n" + - "<b>bdb</b>-Database for a good search performance.</p>\n" + "<b>bdb</b>-Database for a good search performance.\n" + + "<b>mdb</b>-Database uses OpenLDAP's Lightning Memory-Mapped DB (LMDB) library to store data.\n" + + "It similar to the <b>hdb</b> backend but it is both more space-efficient and more execution-efficient.</p>\n" ) + _( "<p>The <b>Base DN</b> option specifies the name of the root entry \nof the database being created.</p>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-auth-server-3.1.8/src/include/auth-server/mirrormode-wizard.rb new/yast2-auth-server-3.1.9/src/include/auth-server/mirrormode-wizard.rb --- old/yast2-auth-server-3.1.8/src/include/auth-server/mirrormode-wizard.rb 2014-05-28 11:45:48.000000000 +0200 +++ new/yast2-auth-server-3.1.9/src/include/auth-server/mirrormode-wizard.rb 2014-06-09 09:20:31.000000000 +0200 @@ -60,7 +60,7 @@ event = {} if !AuthServer.HasMirrorMode Wizard.SetContentsButtons( - caption, + @caption, @dlg_nomm_message, Ops.get_string(@HELPS, "service_dialog", "help not found"), Label.BackButton, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-auth-server-3.1.8/src/include/auth-server/tree_structure.rb new/yast2-auth-server-3.1.9/src/include/auth-server/tree_structure.rb --- old/yast2-auth-server-3.1.8/src/include/auth-server/tree_structure.rb 2014-05-28 11:45:48.000000000 +0200 +++ new/yast2-auth-server-3.1.9/src/include/auth-server/tree_structure.rb 2014-06-09 09:20:31.000000000 +0200 @@ -1380,7 +1380,7 @@ item_name ) - if type == "bdb" || type == "hdb" + if type == "bdb" || type == "hdb" || type == "mdb" Ops.set(@widget_map, item_name, bdb_item_map) Ops.set(@widget_map, Ops.add(item_name, "_index"), dbIndex) Ops.set(@widget_map, Ops.add(item_name, "_ppolicy"), dbPpolicy) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-auth-server-3.1.8/src/modules/AuthServer.pm new/yast2-auth-server-3.1.9/src/modules/AuthServer.pm --- old/yast2-auth-server-3.1.8/src/modules/AuthServer.pm 2014-05-28 11:45:48.000000000 +0200 +++ new/yast2-auth-server-3.1.9/src/modules/AuthServer.pm 2014-06-09 09:20:31.000000000 +0200 @@ -2911,8 +2911,11 @@ if ( SCR->Read(".target.size", $db_config) > 0 ) { SCR->Execute('.target.bash', 'rm -f '.$db_config ); } - # add DB_CONFIG settings to the database object - $rc = SCR->Write(".ldapserver.database.{1}.dbconfig", $dbconfig_defaults ); + if( $database->{type} ne 'mdb' ) + { + # add DB_CONFIG settings to the database object + $rc = SCR->Write(".ldapserver.database.{1}.dbconfig", $dbconfig_defaults ); + } # add default ACLs $rc = SCR->Write(".ldapserver.database.{-1}.acl", $defaultGlobalAcls ); @@ -2936,7 +2939,7 @@ # Read the list of configured Databases. # # @return A list of hashes. Each hash represents a database and has the keys - # 'type' (e.g. "hdb" or "bdb"), 'suffix' (the base DN of the database) and + # 'type' (e.g. "hdb" or "bdb" or "mdb" ), 'suffix' (the base DN of the database) and # 'index' (the index number used by back-config to order databases correctly) # BEGIN { $TYPEINFO {ReadDatabaseList} = ["function", [ "list", [ "map" , "string", "string"] ] ]; } @@ -3727,8 +3730,8 @@ if ( keys %$syncprov ) { my $db = $self->ReadDatabase( $dbindex ); - if ( $db->{'type'} eq "bdb" || $db->{'type'} eq "hdb" ) - { + if ( $db->{'type'} eq "bdb" || $db->{'type'} eq "hdb" || $db->{'type'} eq "mdb" ) + { my $indexes = SCR->Read(".ldapserver.database.{".$dbindex."}.indexes" ); y2milestone("indexes: ". Data::Dumper->Dump([$indexes])); if ( ! $indexes->{'entrycsn'}->{'eq'} ) @@ -3810,7 +3813,7 @@ if ( keys %$syncrepl ) { my $db = $self->ReadDatabase( $dbindex ); - if ( $db->{'type'} eq "bdb" || $db->{'type'} eq "hdb" ) + if ( $db->{'type'} eq "bdb" || $db->{'type'} eq "hdb" || $db->{'type'} eq "mdb" ) { my $indexes = SCR->Read(".ldapserver.database.{".$dbindex."}.indexes" ); y2milestone("indexes: ". Data::Dumper->Dump([$indexes])); @@ -3843,7 +3846,7 @@ for ( my $i=0; $i < scalar(@{$dbs})-1; $i++) { my $type = $dbs->[$i+1]->{'type'}; - if ( $type eq "config" || $type eq "bdb" || $type eq "hdb" ) + if ( $type eq "config" || $type eq "bdb" || $type eq "hdb" || $type eq "mdb" ) { SCR->Write(".ldapserver.database.{".$i."}.syncrepl.del", $uri ); } @@ -4078,6 +4081,8 @@ sub AddDatabase { my ($self, $index, $db, $createDir, $createBase) = @_; + y2milestone( "AddDatabase is called" ); + y2milestone( Dumper($db) ); if ( ! $self->CheckDatabase($db) ) { return 0; @@ -4175,13 +4180,16 @@ return 0; } - # add some defaults to DB_CONFIG - $rc = SCR->Write(".ldapserver.database.{$index}.dbconfig", $dbconfig_defaults ); - if(! $rc ) { - my $err = SCR->Error(".ldapserver"); - y2error("Adding DB_CONFIG failed: ".$err->{'summary'}." ".$err->{'description'}); - $self->SetError( $err->{'summary'}, $err->{'description'} ); - return 0; + if( $db->{type} ne 'mdb' ) + { + # add some defaults to DB_CONFIG + $rc = SCR->Write(".ldapserver.database.{$index}.dbconfig", $dbconfig_defaults ); + if(! $rc ) { + my $err = SCR->Error(".ldapserver"); + y2error("Adding DB_CONFIG failed: ".$err->{'summary'}." ".$err->{'description'}); + $self->SetError( $err->{'summary'}, $err->{'description'} ); + return 0; + } } if ( $createBase ) { @@ -4447,7 +4455,7 @@ y2milestone("Checking SyncProvider Overlay configuration"); my $type = $dbs->[$i+1]->{'type'}; my $suffix = $dbs->[$i+1]->{'suffix'}; - if ( $type eq "config" || $type eq "bdb" || $type eq "hdb" ) + if ( $type eq "config" || $type eq "bdb" || $type eq "hdb" || $type eq "mdb" ) { my $db = SCR->Read(".ldapserver.database.{".$i."}" ); my $prv = SCR->Read(".ldapserver.database.{".$i."}.syncprov" ); @@ -4471,7 +4479,7 @@ y2milestone("Checking SyncConsumer configuration"); my $type = $dbs->[$i+1]->{'type'}; my $suffix = $dbs->[$i+1]->{'suffix'}; - if ( $type eq "config" || $type eq "bdb" || $type eq "hdb" ) + if ( $type eq "config" || $type eq "bdb" || $type eq "hdb" || $type eq "mdb" ) { my $conslist = SCR->Read(".ldapserver.database.{".$i."}.syncrepl" ); my $needsyncrepl = 1; @@ -4542,7 +4550,7 @@ y2milestone("Checking Update Referral"); my $type = $dbs->[$i+1]->{'type'}; my $suffix = $dbs->[$i+1]->{'suffix'}; - if ( $type eq "config" || $type eq "bdb" || $type eq "hdb" ) + if ( $type eq "config" || $type eq "bdb" || $type eq "hdb" || $type eq "mdb" ) { my $updateref = SCR->Read(".ldapserver.database.{".$i."}.updateref" ); if ( ! defined $updateref ) @@ -4560,7 +4568,7 @@ y2milestone("Checking Database ACLs"); my $type = $dbs->[$i+1]->{'type'}; my $suffix = $dbs->[$i+1]->{'suffix'}; - if ( $type eq "config" || $type eq "bdb" || $type eq "hdb" ) + if ( $type eq "config" || $type eq "bdb" || $type eq "hdb" || $type eq "mdb" ) { my $db = SCR->Read(".ldapserver.database.{".$i."}" ); my $needsacl = 0; @@ -4648,7 +4656,7 @@ y2milestone("Checking Database Limits"); my $type = $dbs->[$i+1]->{'type'}; my $suffix = $dbs->[$i+1]->{'suffix'}; - if ( $type eq "config" || $type eq "bdb" || $type eq "hdb" ) + if ( $type eq "config" || $type eq "bdb" || $type eq "hdb" || $type eq "mdb" ) { my $db = SCR->Read(".ldapserver.database.{".$i."}" ); my $needslimit = 1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-auth-server-3.1.8/src/modules/LdapDatabase.rb new/yast2-auth-server-3.1.9/src/modules/LdapDatabase.rb --- old/yast2-auth-server-3.1.8/src/modules/LdapDatabase.rb 2014-05-28 11:45:48.000000000 +0200 +++ new/yast2-auth-server-3.1.9/src/modules/LdapDatabase.rb 2014-06-09 09:20:31.000000000 +0200 @@ -170,7 +170,7 @@ Heading(_("Basic Database Settings")), HSquash( VBox( - Left(ComboBox(Id(:cb_type), _("Database Type"), ["hdb", "bdb"])), + Left(ComboBox(Id(:cb_type), _("Database Type"), ["hdb", "bdb","mdb"])), Left( InputField( Id(:te_basedn), -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
