June 2008 - YaST Commits - openSUSE Mailing Lists

[yast-commit] r48630 - /trunk/ldap-server/src/widgets.ycp
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 15:59:24 2008 New Revision: 48630 URL: http://svn.opensuse.org/viewcvs/yast?rev=48630&view=rev Log: remove unneeded cruft Modified: trunk/ldap-server/src/widgets.ycp Modified: trunk/ldap-server/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/widgets.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/widgets.ycp (original) +++ trunk/ldap-server/src/widgets.ycp Fri Jun 27 15:59:24 2008 @@ -301,18 +301,9 @@ ) ), `VSpacing( 0.5 ), - `HBox( -// `Password( `id( `te_rootpw ), _("LDAP &Password") ), -// `HSpacing( 0.5 ), -// `Password( `id( `te_valid_rootpw ), _("&Validate Password") ), -// `HSpacing( 0.5 ), -// `Left( -// `ComboBox( `id( `cb_cryptmethod ), _("Password &Encryption"), enc_types ) -// ), `Left( `PushButton( `id( `pb_changepw ), _("Change Password") ) - ) - ), + ), `VSpacing( 0.5 ), `Left( `CheckBox( `id( `cb_dbreadonly ), _("Database is read-only"), false ) -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48629 - in /trunk/ldap-server/src: LdapServer.pm agent/SlapdConfigAgent.cc tree_structure.ycp widgets.ycp
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 15:59:21 2008 New Revision: 48629 URL: http://svn.opensuse.org/viewcvs/yast?rev=48629&view=rev Log: Support for admin password change Modified: trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/agent/SlapdConfigAgent.cc trunk/ldap-server/src/tree_structure.ycp trunk/ldap-server/src/widgets.ycp Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Fri Jun 27 15:59:21 2008 @@ -16,6 +16,9 @@ use Data::Dumper; +use Digest::MD5 qw(md5_hex); +use Digest::SHA1 qw(sha1); +use MIME::Base64; use X500::DN; use ycp; use YaST::YCP qw(Boolean); @@ -612,12 +615,48 @@ sub UpdateDatabase { my ($self, $index, $changes) = @_; + y2milestone( "UpdateDatabase: ".Data::Dumper->Dump([$changes]) ); my $rc = SCR->Write(".ldapserver.database.{".$index."}", $changes); - y2milestone( "Database: ".Data::Dumper->Dump([$rc]) ); + y2milestone( "result: ".Data::Dumper->Dump([$rc]) ); return $rc; } +BEGIN { $TYPEINFO {HashPassword} = ["function", "string", "string", "string" ] ; } +sub HashPassword +{ + my ($self, $hashAlgo, $cleartext) = @_; + my $hashed; + if( !grep( ($_ eq $hashAlgo), ("CRYPT", "SMD5", "SHA", "SSHA", "PLAIN") ) ) { + # unsupported password hash + return ""; + } + + if( $hashAlgo eq "CRYPT" ) { + my $salt = pack("C2",(int(rand 26)+65),(int(rand 26)+65)); + $hashed = crypt $cleartext,$salt; + $hashed = "{CRYPT}".$hashed; + } elsif( $hashAlgo eq "SMD5" ) { + my $salt = pack("C5",(int(rand 26)+65),(int(rand 26)+65),(int(rand 26)+65), + (int(rand 26)+65), (int(rand 26)+65)); + my $ctx = new Digest::MD5(); + $ctx->add($cleartext); + $ctx->add($salt); + $hashed = "{SMD5}".encode_base64($ctx->digest.$salt, ""); + } elsif( $hashAlgo eq "SHA"){ + my $digest = sha1($cleartext); + $hashed = "{SHA}".encode_base64($digest, ""); + } elsif( $hashAlgo eq "SSHA"){ + my $salt = pack("C5",(int(rand 26)+65),(int(rand 26)+65),(int(rand 26)+65), + (int(rand 26)+65), (int(rand 26)+65)); + my $digest = sha1($cleartext.$salt); + $hashed = "{SSHA}".encode_base64($digest.$salt, ""); + } else { + $hashed = $cleartext; + } + return $hashed; +} + BEGIN { $TYPEINFO {HaveCommonServerCertificate} = ["function", "boolean" ]; } sub HaveCommonServerCertificate { Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Fri Jun 27 15:59:21 2008 @@ -622,11 +622,16 @@ { if ( path->length() == 1 ) { - YCPValue val = changesMap.value( YCPString("rootdn") ); - if ( val->isString() ) + YCPValue val = changesMap.value( YCPString("rootdn") ); + if ( ! val.isNull() && val->isString() ) { (*i)->setStringValue( "olcRootDn", val->asString()->value_cstr() ); } + val = changesMap.value( YCPString("rootpw") ); + if ( ! val.isNull() && val->isString() ) + { + (*i)->setStringValue( "olcRootPw", val->asString()->value_cstr() ); + } } else { std::string dbComponent = path->component_str(1); y2milestone("Component '%s'", dbComponent.c_str()); Modified: trunk/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y… ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Fri Jun 27 15:59:21 2008 @@ -725,8 +725,8 @@ define boolean cb_check_db() ``{ - string suffix =(string)widget_map[current_tree_item,"name"]:nil; - y2milestone( "calling db check handler for suffix '%1'", suffix ); + string label =(string)widget_map[current_tree_item,"name"]:nil; + y2milestone( "calling db check handler for suffix '%1'", label ); string rootpw = (string)UI::QueryWidget( `te_rootpw, `Value ); if( rootpw != (string)UI::QueryWidget( `te_valid_rootpw, `Value ) ) @@ -757,7 +757,8 @@ if( db["rootdn"]:"" != "" && (boolean)UI::QueryWidget( `cb_append_basedn, `Value ) ) { - string suffix = (string)widget_map[current_tree_item,"name"]:""; + map<string,string> olddb = LdapServer::GetDatabase(index); + string suffix = olddb["suffix"]:""; db["rootdn"] = db["rootdn"]:"" + "," + suffix; } @@ -971,6 +972,7 @@ ``{ string suffix = current_tree_item; y2milestone( "calling db input handler for suffix '%1'", suffix ); + integer index = (integer)widget_map[current_tree_item,"index"]:nil; if ( handler_cmd == `cb_ppolicy_overlay ) { if ( UI::QueryWidget( `cb_ppolicy_overlay, `Value ) == true ) { UI::ChangeWidget( `cb_ppolicy_hashcleartext, `Enabled , true ); @@ -981,7 +983,21 @@ UI::ChangeWidget( `cb_ppolicy_uselockout, `Enabled , false ); UI::ChangeWidget( `te_ppolicy_defaultpolicy, `Enabled , false ); } + } else if ( handler_cmd == `pb_changepw ) { + map<string,string> newpw = ChangeAdminPassword(); + if ( newpw != nil ) + { + y2milestone("set password"); + string newhash = LdapServer::HashPassword(newpw["hashAlgo"]:"", newpw["password"]:""); + y2milestone("new hash: %1", newhash ); + LdapServer::UpdateDatabase( index, $[ "rootpw" : newhash] ); + } + else + { + y2milestone("password change cancelled"); + } } + return true; } @@ -1139,7 +1155,7 @@ * tree generation functions ** *****************************************/ -void addDatabaseWidgetMap( string suffix, string item_name, integer index, boolean new_db ) +void addDatabaseWidgetMap( string label, string item_name, integer index, boolean new_db ) { if( haskey( widget_map, item_name ) ) return; map<string, any> dbIndex = $[ @@ -1150,7 +1166,7 @@ "cb_input" : ``(cb_input_bdb_index() ) ]; map<string,any> item_map = $[ - "name" : suffix, + "name" : label, "children" : [ item_name + "_index" ], "index" : index, "widget" : editBdbDatabase, @@ -1162,7 +1178,7 @@ "cb_write" : ``( cb_write_db() ), "cb_input" : ``( cb_input_db() ) ]; - y2milestone( "adding database item '%1' as '%2'", suffix, item_name ); + y2milestone( "adding database item '%1' as '%2'", label, item_name ); widget_map[item_name] = item_map; widget_map[item_name + "_index"] = dbIndex; Modified: trunk/ldap-server/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/widgets.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/widgets.ycp (original) +++ trunk/ldap-server/src/widgets.ycp Fri Jun 27 15:59:21 2008 @@ -390,6 +390,60 @@ ) ); + define map<string,string> ChangeAdminPassword() + { + map<string,string> result = nil; + term content = + `VBox( + `Heading( _("Change Administrator Password") ), + `Password( `id( `te_rootpw ), _("New Administrator &Password") ), + `HSpacing( 0.5 ), + `Password( `id( `te_valid_rootpw ), _("&Validate Password") ), + `HSpacing( 0.5 ), + `ComboBox( `id( `cb_cryptmethod ), _("Password &Encryption"), enc_types ), + `HBox( + `PushButton( `id( `pb_ok ), Label::OKButton() ), + `PushButton( `id( `pb_cancel ), Label::CancelButton() ) + ) + ); + UI::OpenDialog( `opt(`decorated), content ); + while ( true ) + { + any ret = UI::UserInput(); + if (ret == `pb_cancel ) + { + break; + } + else if ( ret == `pb_ok ) + { + string pw = (string)UI::QueryWidget( `te_rootpw, `Value ); + string verifypw = (string)UI::QueryWidget( `te_valid_rootpw, `Value ); + string hashAlgo = (string)UI::QueryWidget( `cb_cryptmethod, `Value ); + if ( size(pw) == 0 ) + { + Popup::Error( _("Please enter a password") ); + UI::ChangeWidget( `te_rootpw, `Value, "" ); + UI::ChangeWidget( `te_valid_rootpw, `Value, "" ); + } + else if ( pw == verifypw ) + { + result = $[]; + result["password"] = pw; + result["hashAlgo"] = hashAlgo; + break; + } + else + { + Popup::Error( _("The passwords you have enter do not match. Please try again") ); + UI::ChangeWidget( `te_rootpw, `Value, "" ); + UI::ChangeWidget( `te_valid_rootpw, `Value, "" ); + } + } + } + UI::CloseDialog(); + return result; + } + define map<string,any> DatabaseIndexPopup( list<string> skipAttrs, string editAttr, map<string, boolean> currentIdx ) { -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48628 - /trunk/ldap-server/src/tree_structure.ycp
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 15:59:16 2008 New Revision: 48628 URL: http://svn.opensuse.org/viewcvs/yast?rev=48628&view=rev Log: deleting Indexes should work now Modified: trunk/ldap-server/src/tree_structure.ycp Modified: trunk/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y… ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Fri Jun 27 15:59:16 2008 @@ -1049,6 +1049,19 @@ cb_read_bdb_index(); } } + else if ( handler_cmd == `pb_idx_del ) + { + any current_item_id = UI::QueryWidget(`tab_idx, `CurrentItem ); + string editAttr = (string)UI::QueryWidget(`tab_idx, `Cell( current_item_id, 0 ) ); + y2milestone("Selected Attr: %1 %2", current_item_id, editAttr ); + map<string, any> delIdx = $[]; + delIdx["name"] = editAttr; + delIdx["sub"] = false; + delIdx["pres"] = false; + delIdx["eq"] = false; + LdapServer::ChangeDatabaseIndex( index, delIdx ); + cb_read_bdb_index(); + } return true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48627 - /trunk/ldap-server/src/widgets.ycp
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 15:59:13 2008 New Revision: 48627 URL: http://svn.opensuse.org/viewcvs/yast?rev=48627&view=rev Log: Fixed typo ("sub" vs. "substr") Modified: trunk/ldap-server/src/widgets.ycp Modified: trunk/ldap-server/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/widgets.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/widgets.ycp (original) +++ trunk/ldap-server/src/widgets.ycp Fri Jun 27 15:59:13 2008 @@ -439,7 +439,7 @@ if ( currentIdx["pres"]:false ) { UI::ChangeWidget( `cb_idx_pres, `Value, true ); } - if ( currentIdx["substr"]:false ) { + if ( currentIdx["sub"]:false ) { UI::ChangeWidget( `cb_idx_substr, `Value, true ); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48626 - in /trunk/ldap-server/src: agent/SlapdConfigAgent.cc tree_structure.ycp widgets.ycp
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 15:59:09 2008 New Revision: 48626 URL: http://svn.opensuse.org/viewcvs/yast?rev=48626&view=rev Log: Allow to edit already defined Indexes Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc trunk/ldap-server/src/tree_structure.ycp trunk/ldap-server/src/widgets.ycp Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Fri Jun 27 15:59:09 2008 @@ -647,7 +647,12 @@ { idx.push_back(Sub); } - (*i)->addIndex(attr, idx); + if ( ( idx.empty()) || ( ! (*i)->getDatabaseIndex(attr).empty() ) ) { + (*i)->deleteIndex( attr ); + } + if ( ! idx.empty() ) { + (*i)->addIndex(attr, idx); + } } } break; Modified: trunk/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y… ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Fri Jun 27 15:59:09 2008 @@ -1011,6 +1011,7 @@ substrIdx = _("Yes"); } newItems = add( newItems, `item( `id(i), attr, presIdx, eqIdx, substrIdx, approxIdx ) ); + i = i+1; } ); UI::ChangeWidget( `tab_idx, `Items , newItems ); @@ -1021,16 +1022,27 @@ { y2milestone("cb_input_bdb_index, handlercmd: %1", handler_cmd); integer index = (integer) widget_map[current_tree_item, "index"]:nil; - if ( handler_cmd == `pb_idx_add ) + if ( handler_cmd == `pb_idx_add || handler_cmd == `pb_idx_edit ) { + list<string> skip = []; + string editAttr = ""; + map<string, boolean> idx = $[]; map<string, map<string, boolean> > idxMap = LdapServer::GetDatabaseIndexes( index ); - list<string> skip = []; // skip attribute that already have an index defined - foreach( string attr, map<string, boolean> idx, idxMap, - { - skip = add( skip, attr ); - } - ); - map<string, any> newIdx = AddIndexPopup(skip); + if (handler_cmd == `pb_idx_add ) { + // skip attribute that already have an index defined + foreach( string attr, map<string, boolean> idx, idxMap, + { + skip = add( skip, attr ); + } + ); + } else { + any current_item_id = UI::QueryWidget(`tab_idx, `CurrentItem ); + editAttr = (string)UI::QueryWidget(`tab_idx, `Cell( current_item_id, 0 ) ); + idx = idxMap[editAttr]:$[]; + y2milestone("Selected Attr: %1 %2 %3", current_item_id, editAttr, idx ); + } + + map<string, any> newIdx = DatabaseIndexPopup(skip, editAttr, idx); if ( size(newIdx) > 0 ) { LdapServer::ChangeDatabaseIndex( index, newIdx ); Modified: trunk/ldap-server/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/widgets.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/widgets.ycp (original) +++ trunk/ldap-server/src/widgets.ycp Fri Jun 27 15:59:09 2008 @@ -390,13 +390,16 @@ ) ); - define map<string,any> AddIndexPopup( list<string> skipAttrs ) + define map<string,any> DatabaseIndexPopup( list<string> skipAttrs, string editAttr, + map<string, boolean> currentIdx ) { y2milestone("AddIndexPopup skipAttrs: %1", skipAttrs ); term content = `VBox( `Heading( _("Add Index") ), - `ComboBox( `id( `cb_attrs ), `opt( `hstretch, `notify ), "Attributetypes" ), + `ReplacePoint( `id( `rp_attrs ), + `ComboBox( `id( `cb_attrs ), `opt( `hstretch, `notify ), "Attributetypes" ) + ), `Left( `CheckBox( `id( `cb_idx_pres ), _("Presence") ) ), @@ -411,19 +414,44 @@ `PushButton( `id( `pb_cancel ), Label::CancelButton() ) ) ); + map <string, map<string,boolean> > attrTypes = (map<string, map <string,boolean> >) SCR::Read( .ldapserver.schema.attributeTypes ); - list<string> items = []; - foreach(string key, map<string,boolean> idx, attrTypes, { - if ( nil == find( string elem, skipAttrs, ``( tolower(elem) == tolower(key) ) ) ) { - items = add( items, key ); - } - } ); - items = lsort(items); - UI::OpenDialog( `opt(`decorated), content ); - UI::ChangeWidget( `cb_attrs, `Items, items ); + if ( editAttr == "" ) { + list<string> items = []; + foreach(string key, map<string,boolean> idx, attrTypes, { + if ( nil == find( string elem, skipAttrs, ``( tolower(elem) == tolower(key) ) ) ) { + items = add( items, key ); + } + } ); + items = lsort(items); + UI::OpenDialog( `opt(`decorated), content ); + UI::ChangeWidget( `cb_attrs, `Items, items ); + } else { + UI::OpenDialog( `opt(`decorated), content ); + UI::ReplaceWidget(`rp_attrs, + `Label( `id( `attr ), editAttr) + ); + y2milestone("Current IDX: %1", currentIdx ); + if ( currentIdx["eq"]:false ) { + UI::ChangeWidget( `cb_idx_eq, `Value, true ); + } + if ( currentIdx["pres"]:false ) { + UI::ChangeWidget( `cb_idx_pres, `Value, true ); + } + if ( currentIdx["substr"]:false ) { + UI::ChangeWidget( `cb_idx_substr, `Value, true ); + } + } + + string selectedAttr = ""; + if ( editAttr == "" ) + { + selectedAttr = (string) UI::QueryWidget( `cb_attrs, `Value ); + } else { + selectedAttr = editAttr; + } - string selectedAttr = (string) UI::QueryWidget( `cb_attrs, `Value ); y2milestone("selected Attribute \"%1\"", selectedAttr ); map <string, boolean> idxOpt = attrTypes[selectedAttr]:nil ; y2milestone("index opts: %1", idxOpt ); @@ -455,8 +483,11 @@ { break; } - selectedAttr = (string) UI::QueryWidget( `cb_attrs, `Value ); - y2milestone("selected Attribute \"%1\"", selectedAttr ); + if ( editAttr == "" ) + { + selectedAttr = (string) UI::QueryWidget( `cb_attrs, `Value ); + y2milestone("selected Attribute \"%1\"", selectedAttr ); + } if ( ret == `cb_attrs ) // Attribute selected in the Combobox { map <string, boolean> idxOpt = attrTypes[selectedAttr]:nil ; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48625 - in /trunk/ldap-server/src/lib: backConfigTest.cpp backConfigTest.h
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 15:59:05 2008 New Revision: 48625 URL: http://svn.opensuse.org/viewcvs/yast?rev=48625&view=rev Log: Support for deleting Indexes Modified: trunk/ldap-server/src/lib/backConfigTest.cpp trunk/ldap-server/src/lib/backConfigTest.h Modified: trunk/ldap-server/src/lib/backConfigTest.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/backConfigTe… ============================================================================== --- trunk/ldap-server/src/lib/backConfigTest.cpp (original) +++ trunk/ldap-server/src/lib/backConfigTest.cpp Fri Jun 27 15:59:05 2008 @@ -187,8 +187,26 @@ this->addStringValue( "olcDbIndex", indexString ); } -void OlcBdbDatabase::deleteIndex(const std::string& attr) +void OlcBdbDatabase::deleteIndex(const std::string& type) { + const LDAPAttribute *attr = m_dbEntryChanged.getAttributes()->getAttributeByName("olcdbindex"); + if (! attr ) { + return; + }; + + StringList sl = attr->getValues(); + StringList newValues; + StringList::const_iterator i; + for (i = sl.begin(); i != sl.end(); i++ ) { + std::string attrType; + std::string indexes; + splitIndexString(*i, attrType, indexes ); + if ( attrType != type ) + { + newValues.add(*i); + } + } + this->setStringValues("olcdbindex", newValues ); } void OlcBdbDatabase::setDirectory( const std::string &dir ) @@ -765,7 +783,7 @@ replace = true; } else { modifications.addModification( - LDAPModification( LDAPAttribute(i->getName()), + LDAPModification( LDAPAttribute(i->getName(), delValues ), LDAPModification::OP_DELETE) ); } Modified: trunk/ldap-server/src/lib/backConfigTest.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/backConfigTe… ============================================================================== --- trunk/ldap-server/src/lib/backConfigTest.h (original) +++ trunk/ldap-server/src/lib/backConfigTest.h Fri Jun 27 15:59:05 2008 @@ -99,7 +99,7 @@ virtual IndexMap getDatabaseIndexes() const {}; virtual std::vector<IndexType> getDatabaseIndex( const std::string &attr ) const {}; virtual void addIndex(const std::string& attr, const std::vector<IndexType>& idx) {}; - + virtual void deleteIndex(const std::string& attr) {}; protected: virtual void updateEntryDn(); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48624 - in /trunk/ldap-server/src/lib: backConfigTest.cpp backConfigTest.h
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 15:59:02 2008 New Revision: 48624 URL: http://svn.opensuse.org/viewcvs/yast?rev=48624&view=rev Log: splitted parsing of olcindex Values into separater functions Modified: trunk/ldap-server/src/lib/backConfigTest.cpp trunk/ldap-server/src/lib/backConfigTest.h Modified: trunk/ldap-server/src/lib/backConfigTest.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/backConfigTe… ============================================================================== --- trunk/ldap-server/src/lib/backConfigTest.cpp (original) +++ trunk/ldap-server/src/lib/backConfigTest.cpp Fri Jun 27 15:59:02 2008 @@ -65,6 +65,52 @@ OlcBdbDatabase::OlcBdbDatabase( const LDAPEntry& le) : OlcDatabase(le) { } +inline void splitIndexString( const std::string &indexString, std::string &attr, std::string &indexes ) +{ + std::string::size_type pos = indexString.find_first_of(" \t"); + attr = indexString.substr(0, pos); + std::cout << "AttributeType: <" << attr << ">" << std::endl; + if ( pos != std::string::npos ) { + pos = indexString.find_first_not_of(" \t", pos); + if ( pos != std::string::npos ) { + indexes = indexString.substr( pos, std::string::npos ); + } + } +} + +inline std::vector<IndexType> indexString2Type( const std::string &indexes ) +{ + std::string::size_type pos, oldpos = 0; + std::vector<IndexType> idx; + do { + pos = indexes.find( ',', oldpos ); + std::string index = indexes.substr( oldpos, + (pos == std::string::npos ? std::string::npos : pos - oldpos) ); + std::cout << "Index: <" << index << ">" << std::endl; + oldpos = indexes.find_first_not_of( ", ", pos ); + if ( index == "pres" ) { + idx.push_back(Present); + } else if (index == "eq" ) { + idx.push_back(Eq); + } else if (index == "approx" ) { + idx.push_back(Approx); + } else if (index == "sub" ) { + idx.push_back(Sub); + } else if (index == "subinital" ) { + idx.push_back(SpecialSubInitial); + } else if (index == "subany" ) { + idx.push_back(SpecialSubAny); + } else if (index == "subfinal" ) { + idx.push_back(SpecialSubFinal); + } else if (index == "nolang" ) { + idx.push_back(SpecialNoLang); + } else if (index == "nosubtypes" ) { + idx.push_back(SpecialNoSubTypes); + } + } while (pos != std::string::npos); + return idx; +} + IndexMap OlcBdbDatabase::getDatabaseIndexes() const { const LDAPAttributeList *al = m_dbEntryChanged.getAttributes(); @@ -77,46 +123,35 @@ StringList sl = attr->getValues(); StringList::const_iterator i; for (i = sl.begin(); i != sl.end(); i++ ) { - std::cout << "Index Value: " << *i << std::endl; - std::string::size_type pos = i->find_first_of(" \t"); - std::string attrType = i->substr(0, pos); - std::cout << "AttributeType: <" << attrType << ">" << std::endl; + std::string attrType; std::string indexes; - if ( pos != std::string::npos ) { - pos = i->find_first_not_of(" \t", pos); - if ( pos != std::string::npos ) { - indexes = i->substr( pos, std::string::npos ); - std::cout << "Indexes: <" << indexes << ">" << std::endl; - std::string::size_type oldpos = 0; - std::vector<IndexType> idx; - do { - pos = indexes.find( ',', oldpos ); - std::string index = indexes.substr( oldpos, - (pos == std::string::npos ? std::string::npos : pos - oldpos) ); - std::cout << "Index: <" << index << ">" << std::endl; - oldpos = indexes.find_first_not_of( ", ", pos ); - if ( index == "pres" ) { - idx.push_back(Present); - } else if (index == "eq" ) { - idx.push_back(Eq); - } else if (index == "approx" ) { - idx.push_back(Approx); - } else if (index == "sub" ) { - idx.push_back(Sub); - } else if (index == "subinital" ) { - idx.push_back(SpecialSubInitial); - } else if (index == "subany" ) { - idx.push_back(SpecialSubAny); - } else if (index == "subfinal" ) { - idx.push_back(SpecialSubFinal); - } else if (index == "nolang" ) { - idx.push_back(SpecialNoLang); - } else if (index == "nosubtypes" ) { - idx.push_back(SpecialNoSubTypes); - } - } while (pos != std::string::npos); - res.insert(make_pair(attrType, idx)); - } + splitIndexString(*i, attrType, indexes ); + std::cout << "Indexes: <" << indexes << ">" << std::endl; + std::vector<IndexType> idx = indexString2Type(indexes); + res.insert(make_pair(attrType, idx)); + } + return res; +} + +std::vector<IndexType> OlcBdbDatabase::getDatabaseIndex( const std::string &type ) const +{ + const LDAPAttributeList *al = m_dbEntryChanged.getAttributes(); + const LDAPAttribute *attr = al->getAttributeByName("olcdbindex"); + std::vector<IndexType> res; + if (! attr ) { + return res; + }; + + StringList sl = attr->getValues(); + StringList::const_iterator i; + for (i = sl.begin(); i != sl.end(); i++ ) { + std::string attrType; + std::string indexes; + splitIndexString(*i, attrType, indexes ); + if ( attrType == type ) + { + res = indexString2Type(indexes); + break; } } return res; @@ -152,6 +187,10 @@ this->addStringValue( "olcDbIndex", indexString ); } +void OlcBdbDatabase::deleteIndex(const std::string& attr) +{ +} + void OlcBdbDatabase::setDirectory( const std::string &dir ) { this->setStringValue("olcDbDirectory", dir); Modified: trunk/ldap-server/src/lib/backConfigTest.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/backConfigTe… ============================================================================== --- trunk/ldap-server/src/lib/backConfigTest.h (original) +++ trunk/ldap-server/src/lib/backConfigTest.h Fri Jun 27 15:59:02 2008 @@ -97,6 +97,7 @@ virtual std::map<std::string, std::list<std::string> > toMap() const; virtual IndexMap getDatabaseIndexes() const {}; + virtual std::vector<IndexType> getDatabaseIndex( const std::string &attr ) const {}; virtual void addIndex(const std::string& attr, const std::vector<IndexType>& idx) {}; @@ -115,7 +116,9 @@ void setDirectory( const std::string &dir); virtual IndexMap getDatabaseIndexes() const; + virtual std::vector<IndexType> getDatabaseIndex( const std::string &attr ) const; virtual void addIndex(const std::string& attr, const std::vector<IndexType>& idx); + virtual void deleteIndex(const std::string& attr); }; class OlcTlsSettings; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48623 - in /trunk/ldap-server/src: agent/SlapdConfigAgent.cc lib/backConfigTest.cpp lib/backConfigTest.h
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 15:58:58 2008 New Revision: 48623 URL: http://svn.opensuse.org/viewcvs/yast?rev=48623&view=rev Log: Renamed ambigous getIndex() methods Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc trunk/ldap-server/src/lib/backConfigTest.cpp trunk/ldap-server/src/lib/backConfigTest.h Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Fri Jun 27 15:58:58 2008 @@ -331,7 +331,7 @@ YCPMap ymap; ymap.add( YCPString("suffix"), YCPString((*i)->getSuffix()) ); ymap.add( YCPString("type"), YCPString((*i)->getType()) ); - ymap.add( YCPString("index"), YCPInteger((*i)->getIndex()) ); + ymap.add( YCPString("index"), YCPInteger((*i)->getEntryIndex()) ); dbList.add(ymap); } return dbList; @@ -365,7 +365,7 @@ OlcDatabaseList::const_iterator i; for ( i = databases.begin(); i != databases.end() ; i++ ) { - if ( (*i)->getIndex() == dbIndex ) + if ( (*i)->getEntryIndex() == dbIndex ) { YCPMap resMap; if ( path->length() == 1 ) @@ -380,7 +380,7 @@ } else { std::string dbComponent = path->component_str(1); y2milestone("Component %s ", dbComponent.c_str()); - IndexMap idx = (*i)->getIndexes(); + IndexMap idx = (*i)->getDatabaseIndexes(); IndexMap::const_iterator j = idx.begin(); for ( ; j != idx.end(); j++ ) { @@ -618,7 +618,7 @@ OlcDatabaseList::const_iterator i; for ( i = databases.begin(); i != databases.end() ; i++ ) { - if ( (*i)->getIndex() == dbIndex ) + if ( (*i)->getEntryIndex() == dbIndex ) { if ( path->length() == 1 ) { @@ -634,7 +634,7 @@ { std::vector<IndexType> idx; std::string attr( arg->asMap()->value(YCPString("name"))->asString()->value_cstr() ); - y2milestone("New Index for Attribute: '%s'", attr.c_str() ); + y2milestone("Edit Index for Attribute: '%s'", attr.c_str() ); if ( arg->asMap()->value(YCPString("pres"))->asBoolean()->value() == true ) { idx.push_back(Present); Modified: trunk/ldap-server/src/lib/backConfigTest.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/backConfigTe… ============================================================================== --- trunk/ldap-server/src/lib/backConfigTest.cpp (original) +++ trunk/ldap-server/src/lib/backConfigTest.cpp Fri Jun 27 15:58:58 2008 @@ -65,7 +65,7 @@ OlcBdbDatabase::OlcBdbDatabase( const LDAPEntry& le) : OlcDatabase(le) { } -IndexMap OlcBdbDatabase::getIndexes() const +IndexMap OlcBdbDatabase::getDatabaseIndexes() const { const LDAPAttributeList *al = m_dbEntryChanged.getAttributes(); const LDAPAttribute *attr = al->getAttributeByName("olcdbindex"); @@ -490,7 +490,7 @@ this->updateEntryDn(); } -int OlcConfigEntry::getIndex() const +int OlcConfigEntry::getEntryIndex() const { return this->entryIndex; } @@ -998,7 +998,7 @@ if ( dbEntry ) { std::cout << "Got DBEntry: " << dbEntry->getDN() << std::endl; OlcBdbDatabase db(*dbEntry); - OlcBdbDatabase::IndexMap idx = db.getIndexes(); + OlcBdbDatabase::IndexMap idx = db.getDatabaseIndexes(); OlcBdbDatabase::IndexMap::const_iterator i = idx.find("cn"); std::cout << "Idx: " << i->second[0] << " " << OlcBdbDatabase::Eq << std::endl; Modified: trunk/ldap-server/src/lib/backConfigTest.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/backConfigTe… ============================================================================== --- trunk/ldap-server/src/lib/backConfigTest.h (original) +++ trunk/ldap-server/src/lib/backConfigTest.h Fri Jun 27 15:58:58 2008 @@ -50,7 +50,7 @@ void setIndex( int index ); void getEntryDn(); - int getIndex() const; + int getEntryIndex() const; virtual std::map<std::string, std::list<std::string> > toMap() const; virtual std::string toLdif() const; @@ -96,7 +96,7 @@ const std::string getType() const; virtual std::map<std::string, std::list<std::string> > toMap() const; - virtual IndexMap getIndexes() const {}; + virtual IndexMap getDatabaseIndexes() const {}; virtual void addIndex(const std::string& attr, const std::vector<IndexType>& idx) {}; @@ -114,7 +114,7 @@ virtual std::map<std::string, std::list<std::string> > toMap() const; void setDirectory( const std::string &dir); - virtual IndexMap getIndexes() const; + virtual IndexMap getDatabaseIndexes() const; virtual void addIndex(const std::string& attr, const std::vector<IndexType>& idx); }; -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48622 - in /trunk/ldap-server/src: agent/SlapdConfigAgent.cc lib/backConfigTest.cpp lib/backConfigTest.h tree_structure.ycp
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 15:58:54 2008 New Revision: 48622 URL: http://svn.opensuse.org/viewcvs/yast?rev=48622&view=rev Log: Add Index support Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc trunk/ldap-server/src/lib/backConfigTest.cpp trunk/ldap-server/src/lib/backConfigTest.h trunk/ldap-server/src/tree_structure.ycp Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Fri Jun 27 15:58:54 2008 @@ -389,8 +389,13 @@ std::vector<IndexType>::const_iterator k = j->second.begin(); for ( ; k != j->second.end(); k++ ) { - if ( *k == Eq ) + if ( *k == Eq ){ ycpIdx.add(YCPString("eq"), YCPBoolean(true) ); + } else if ( *k == Present ){ + ycpIdx.add(YCPString("pres"), YCPBoolean(true) ); + } else if ( *k == Sub ){ + ycpIdx.add(YCPString("sub"), YCPBoolean(true) ); + } } resMap.add( YCPString(j->first), ycpIdx ); } Modified: trunk/ldap-server/src/lib/backConfigTest.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/backConfigTe… ============================================================================== --- trunk/ldap-server/src/lib/backConfigTest.cpp (original) +++ trunk/ldap-server/src/lib/backConfigTest.cpp Fri Jun 27 15:58:54 2008 @@ -149,6 +149,7 @@ } } std::cout << "indexString: '" << indexString << "'" << std::endl; + this->addStringValue( "olcDbIndex", indexString ); } void OlcBdbDatabase::setDirectory( const std::string &dir ) @@ -638,6 +639,19 @@ m_dbEntryChanged.replaceAttribute(attr); } +void OlcConfigEntry::addStringValue(const std::string &type, const std::string &value) +{ + const LDAPAttribute *attr = m_dbEntryChanged.getAttributeByName(type); + if ( attr ) { + LDAPAttribute newAttr(*attr); + newAttr.addValue(value); + m_dbEntryChanged.replaceAttribute(newAttr); + } else { + LDAPAttribute newAttr(type, value); + m_dbEntryChanged.addAttribute(newAttr); + } +} + std::string OlcConfigEntry::toLdif() const { std::ostringstream ldifStream; Modified: trunk/ldap-server/src/lib/backConfigTest.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/backConfigTe… ============================================================================== --- trunk/ldap-server/src/lib/backConfigTest.h (original) +++ trunk/ldap-server/src/lib/backConfigTest.h Fri Jun 27 15:58:54 2008 @@ -45,6 +45,7 @@ // shortcuts for single-valued Attributes std::string getStringValue(const std::string &type) const; void setStringValue(const std::string &type, const std::string &value); + void addStringValue(const std::string &type, const std::string &value); void setIndex( int index ); void getEntryDn(); Modified: trunk/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y… ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Fri Jun 27 15:58:54 2008 @@ -1000,9 +1000,16 @@ y2milestone("index attr: %1", attr); if ( idx["eq"]:false ) { - y2milestone("eq index"); eqIdx = _("Yes"); } + if ( idx["pres"]:false ) + { + presIdx = _("Yes"); + } + if ( idx["sub"]:false ) + { + substrIdx = _("Yes"); + } newItems = add( newItems, `item( `id(i), attr, presIdx, eqIdx, substrIdx, approxIdx ) ); } ); UI::ChangeWidget( `tab_idx, `Items , newItems ); @@ -1027,8 +1034,8 @@ if ( size(newIdx) > 0 ) { LdapServer::ChangeDatabaseIndex( index, newIdx ); + cb_read_bdb_index(); } - } return true; } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r48621 - in /trunk/ldap-server/src: LdapServer.pm agent/SlapdConfigAgent.cc lib/backConfigTest.cpp lib/backConfigTest.h tree_structure.ycp widgets.ycp
by rhafer＠svn.opensuse.org 27 Jun '08

27 Jun '08

Author: rhafer Date: Fri Jun 27 15:58:49 2008 New Revision: 48621 URL: http://svn.opensuse.org/viewcvs/yast?rev=48621&view=rev Log: First step to write support for indexes Modified: trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/agent/SlapdConfigAgent.cc trunk/ldap-server/src/lib/backConfigTest.cpp trunk/ldap-server/src/lib/backConfigTest.h trunk/ldap-server/src/tree_structure.ycp trunk/ldap-server/src/widgets.ycp Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?re… ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Fri Jun 27 15:58:49 2008 @@ -566,6 +566,18 @@ return $rc; } +BEGIN { $TYPEINFO {ChangeDatabaseIndex} = ["function", "boolean" , "integer", ["map", "string", "any" ] ]; } +sub ChangeDatabaseIndex +{ + my ($self, $dbIndex, $newIdx ) = @_; + y2milestone("ChangeDatabaseIndex: ".Data::Dumper->Dump([$newIdx]) ); + $newIdx->{'pres'} = YaST::YCP::Boolean($newIdx->{'pres'}); + $newIdx->{'eq'} = YaST::YCP::Boolean($newIdx->{'eq'}); + $newIdx->{'sub'} = YaST::YCP::Boolean($newIdx->{'sub'}); + my $rc = SCR->Write(".ldapserver.database.{".$dbIndex."}.index", $newIdx ); +} + + BEGIN { $TYPEINFO {GetSchemaList} = ["function", [ "list" , "string"] ]; } sub GetSchemaList { Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfi… ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Fri Jun 27 15:58:49 2008 @@ -615,11 +615,37 @@ { if ( (*i)->getIndex() == dbIndex ) { - YCPValue val = changesMap.value( YCPString("rootdn") ); - if ( val->isString() ) + if ( path->length() == 1 ) { - (*i)->setStringValue( "olcRootDn", val->asString()->value_cstr() ); + YCPValue val = changesMap.value( YCPString("rootdn") ); + if ( val->isString() ) + { + (*i)->setStringValue( "olcRootDn", val->asString()->value_cstr() ); + } + } else { + std::string dbComponent = path->component_str(1); + y2milestone("Component '%s'", dbComponent.c_str()); + if ( dbComponent == "index" ) + { + std::vector<IndexType> idx; + std::string attr( arg->asMap()->value(YCPString("name"))->asString()->value_cstr() ); + y2milestone("New Index for Attribute: '%s'", attr.c_str() ); + if ( arg->asMap()->value(YCPString("pres"))->asBoolean()->value() == true ) + { + idx.push_back(Present); + } + if ( arg->asMap()->value(YCPString("eq"))->asBoolean()->value() == true ) + { + idx.push_back(Eq); + } + if ( arg->asMap()->value(YCPString("sub"))->asBoolean()->value() == true ) + { + idx.push_back(Sub); + } + (*i)->addIndex(attr, idx); + } } + break; } } return YCPBoolean(false); Modified: trunk/ldap-server/src/lib/backConfigTest.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/backConfigTe… ============================================================================== --- trunk/ldap-server/src/lib/backConfigTest.cpp (original) +++ trunk/ldap-server/src/lib/backConfigTest.cpp Fri Jun 27 15:58:49 2008 @@ -122,6 +122,35 @@ return res; } +void OlcBdbDatabase::addIndex(const std::string& attr, const std::vector<IndexType>& idx) +{ + std::string indexString = attr; + std::vector<IndexType>::const_iterator i; + bool first = true; + for ( i = idx.begin(); i != idx.end(); i++ ) + { + if (! first) + { + indexString += ","; + } else { + indexString += " "; + first = false; + } + if ( *i == Present ) { + indexString += "pres"; + } + else if ( *i == Eq ) + { + indexString += "eq"; + } + else if ( *i == Sub ) + { + indexString += "sub"; + } + } + std::cout << "indexString: '" << indexString << "'" << std::endl; +} + void OlcBdbDatabase::setDirectory( const std::string &dir ) { this->setStringValue("olcDbDirectory", dir); Modified: trunk/ldap-server/src/lib/backConfigTest.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/lib/backConfigTe… ============================================================================== --- trunk/ldap-server/src/lib/backConfigTest.h (original) +++ trunk/ldap-server/src/lib/backConfigTest.h Fri Jun 27 15:58:49 2008 @@ -96,6 +96,7 @@ virtual std::map<std::string, std::list<std::string> > toMap() const; virtual IndexMap getIndexes() const {}; + virtual void addIndex(const std::string& attr, const std::vector<IndexType>& idx) {}; protected: @@ -111,9 +112,9 @@ OlcBdbDatabase( const LDAPEntry& le ); virtual std::map<std::string, std::list<std::string> > toMap() const; void setDirectory( const std::string &dir); - virtual IndexMap getIndexes() const; + virtual void addIndex(const std::string& attr, const std::vector<IndexType>& idx); }; class OlcTlsSettings; Modified: trunk/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.y… ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Fri Jun 27 15:58:49 2008 @@ -1023,9 +1023,10 @@ skip = add( skip, attr ); } ); - map<string,any> newIdx = AddIndexPopup(skip); + map<string, any> newIdx = AddIndexPopup(skip); if ( size(newIdx) > 0 ) { + LdapServer::ChangeDatabaseIndex( index, newIdx ); } } Modified: trunk/ldap-server/src/widgets.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/widgets.ycp?rev=… ============================================================================== --- trunk/ldap-server/src/widgets.ycp (original) +++ trunk/ldap-server/src/widgets.ycp Fri Jun 27 15:58:49 2008 @@ -484,8 +484,8 @@ retval["name"] = selectedAttr; retval["pres"] = UI::QueryWidget( `cb_idx_pres, `Value ); retval["eq"] = UI::QueryWidget( `cb_idx_eq, `Value ); - retval["substr"] = UI::QueryWidget( `cb_idx_substr, `Value ); - y2milestone("new index: %1", newidx ); + retval["sub"] = UI::QueryWidget( `cb_idx_substr, `Value ); + y2milestone("new index: %1", retval ); break; } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0