directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r448619 - in /directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core: authz/AuthorizationService.java partition/impl/btree/BTreePartition.java
Date Thu, 21 Sep 2006 18:12:25 GMT
Author: akarasulu
Date: Thu Sep 21 11:12:24 2006
New Revision: 448619

URL: http://svn.apache.org/viewvc?view=rev&rev=448619
Log:
fixing critical bug with JNDI provider where specified attributes were not being returned
in ctx.getAttributes() call

Modified:
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java
    directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java?view=diff&rev=448619&r1=448618&r2=448619
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java
(original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/authz/AuthorizationService.java
Thu Sep 21 11:12:24 2006
@@ -671,8 +671,6 @@
     public Attributes lookup( NextInterceptor next, LdapDN dn, String[] attrIds ) throws
NamingException
     {
         Invocation invocation = InvocationStack.getInstance().peek();
-        PartitionNexusProxy proxy = invocation.getProxy();
-        Attributes entry = proxy.lookup( dn, PartitionNexusProxy.LOOKUP_BYPASS );
         LdapPrincipal principal = ( ( ServerContext ) invocation.getCaller() ).getPrincipal();
         LdapDN principalDn = new LdapDN( principal.getName() );
         principalDn.normalize( attrRegistry.getNormalizerMapping() );
@@ -682,6 +680,8 @@
             return next.lookup( dn, attrIds );
         }
 
+        PartitionNexusProxy proxy = invocation.getProxy();
+        Attributes entry = proxy.lookup( dn, PartitionNexusProxy.LOOKUP_BYPASS );
         checkLookupAccess( principal, dn, entry );
         return next.lookup( dn, attrIds );
     }

Modified: directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java?view=diff&rev=448619&r1=448618&r2=448619
==============================================================================
--- directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
(original)
+++ directory/trunks/apacheds/core/src/main/java/org/apache/directory/server/core/partition/impl/btree/BTreePartition.java
Thu Sep 21 11:12:24 2006
@@ -425,7 +425,7 @@
 
         for ( int ii = 0; ii < attrIds.length; ii++ )
         {
-            Attribute attr = entry.get( attrIds[0] );
+            Attribute attr = entry.get( attrIds[ii] );
 
             if ( attr != null )
             {



Mime
View raw message