Author: rhafer Date: Tue Sep 2 10:32:39 2008 New Revision: 50543 URL: http://svn.opensuse.org/viewcvs/yast?rev=50543&view=rev Log: Stubs for ACL read support Modified: trunk/ldap-server/src/LdapServer.pm trunk/ldap-server/src/agent/SlapdConfigAgent.cc trunk/ldap-server/src/tree_structure.ycp Modified: trunk/ldap-server/src/LdapServer.pm URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/LdapServer.pm?rev=50543&r1=50542&r2=50543&view=diff ============================================================================== --- trunk/ldap-server/src/LdapServer.pm (original) +++ trunk/ldap-server/src/LdapServer.pm Tue Sep 2 10:32:39 2008 @@ -1167,6 +1167,16 @@ return $rc; } +BEGIN { $TYPEINFO {ReadDatabaseAcl} = ["function", [ "list", [ "map", "string", "any" ] ], "integer" ]; } +sub ReadDatabaseAcl +{ + my ($self, $index) = @_; + y2milestone("ReadDatabaseAcl ".$index); + my $rc = SCR->Read(".ldapserver.database.{".$index."}.acl" ); + y2milestone( "ACL: ".Data::Dumper->Dump([$rc]) ); + return $rc; +} + BEGIN { $TYPEINFO {ChangeDatabaseAcl} = ["function", "boolean" , "integer", ["list", [ "map", "string", "any" ] ] ]; } sub ChangeDatabaseAcl { Modified: trunk/ldap-server/src/agent/SlapdConfigAgent.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/agent/SlapdConfigAgent.cc?rev=50543&r1=50542&r2=50543&view=diff ============================================================================== --- trunk/ldap-server/src/agent/SlapdConfigAgent.cc (original) +++ trunk/ldap-server/src/agent/SlapdConfigAgent.cc Tue Sep 2 10:32:39 2008 @@ -590,7 +590,6 @@ { OlcOverlayList overlays = (*i)->getOverlays(); OlcOverlayList::const_iterator j = overlays.begin(); - YCPList resList; for (; j != overlays.end(); j++ ) { if ( (*j)->getType() == "ppolicy" ) @@ -617,7 +616,11 @@ } } return resMap; - } + } + else if ( dbComponent == "acl" ) + { + return resMap; + } else { lastError->add(YCPString("summary"), YCPString("Read Failed") ); Modified: trunk/ldap-server/src/tree_structure.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/ldap-server/src/tree_structure.ycp?rev=50543&r1=50542&r2=50543&view=diff ============================================================================== --- trunk/ldap-server/src/tree_structure.ycp (original) +++ trunk/ldap-server/src/tree_structure.ycp Tue Sep 2 10:32:39 2008 @@ -753,6 +753,7 @@ y2milestone("cb_read_acl()"); string treeItem = current_tree_item; integer index = (integer)widget_map[current_tree_item,"index"]:nil; + list<map> acllist = LdapServer::ReadDatabaseAcl( index ); return LdapDatabase::DbAclRead( index ); } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org