directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r987491 - in /directory/apacheds/branches/apacheds-codec-merge: all/ core-annotations/ core-api/ core-avl/ core-constants/ core-integ/ core-integ/src/test/java/org/apache/directory/server/core/collective/ core-jndi/ core/ core/src/main/java...
Date Fri, 20 Aug 2010 13:02:00 GMT
Author: elecharny
Date: Fri Aug 20 13:01:59 2010
New Revision: 987491

URL: http://svn.apache.org/viewvc?rev=987491&view=rev
Log:
Merged trunk into the codec branch

Modified:
    directory/apacheds/branches/apacheds-codec-merge/all/   (props changed)
    directory/apacheds/branches/apacheds-codec-merge/core/   (props changed)
    directory/apacheds/branches/apacheds-codec-merge/core-annotations/   (props changed)
    directory/apacheds/branches/apacheds-codec-merge/core-api/   (props changed)
    directory/apacheds/branches/apacheds-codec-merge/core-avl/   (props changed)
    directory/apacheds/branches/apacheds-codec-merge/core-constants/   (props changed)
    directory/apacheds/branches/apacheds-codec-merge/core-integ/   (props changed)
    directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java
  (props changed)
    directory/apacheds/branches/apacheds-codec-merge/core-jndi/   (props changed)
    directory/apacheds/branches/apacheds-codec-merge/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
    directory/apacheds/branches/apacheds-codec-merge/i18n/   (props changed)

Propchange: directory/apacheds/branches/apacheds-codec-merge/all/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 13:01:59 2010
@@ -1,2 +1,2 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/all:980138-980938
-/directory/apacheds/trunk/all:980025-980137,982368-982966
+/directory/apacheds/trunk/all:980025-980137,982368-987479

Propchange: directory/apacheds/branches/apacheds-codec-merge/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 13:01:59 2010
@@ -1,2 +1,2 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/core:980138-980934
-/directory/apacheds/trunk/core:982368-982966
+/directory/apacheds/trunk/core:982368-987479

Propchange: directory/apacheds/branches/apacheds-codec-merge/core-annotations/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 13:01:59 2010
@@ -1,2 +1,2 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/core-annotations:980138-980934
-/directory/apacheds/trunk/core-annotations:980025-980137,982368-982966
+/directory/apacheds/trunk/core-annotations:980025-980137,982368-987479

Propchange: directory/apacheds/branches/apacheds-codec-merge/core-api/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 13:01:59 2010
@@ -1,2 +1,2 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/core-api:980138-980934
-/directory/apacheds/trunk/core-api:982368-982966
+/directory/apacheds/trunk/core-api:982368-987479

Propchange: directory/apacheds/branches/apacheds-codec-merge/core-avl/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 13:01:59 2010
@@ -1,2 +1,2 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/core-avl:980138-980934
-/directory/apacheds/trunk/core-avl:980025-980137,982368-982966
+/directory/apacheds/trunk/core-avl:980025-980137,982368-987479

Propchange: directory/apacheds/branches/apacheds-codec-merge/core-constants/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 13:01:59 2010
@@ -1,2 +1,2 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/core-constants:980138-980934
-/directory/apacheds/trunk/core-constants:980025-980137,982368-982966
+/directory/apacheds/trunk/core-constants:980025-980137,982368-987479

Propchange: directory/apacheds/branches/apacheds-codec-merge/core-integ/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 13:01:59 2010
@@ -1,2 +1,2 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/core-integ:980138-980934
-/directory/apacheds/trunk/core-integ:982368-982968
+/directory/apacheds/trunk/core-integ:982368-987479

Propchange: directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 13:01:59 2010
@@ -4,4 +4,4 @@
 /directory/apacheds/branches/apacheds-subtree/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:965202-966561
 /directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:599654-600228
 /directory/apacheds/branches/xdbm-refactoring/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:945827-946347
-/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:982368-982968
+/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:982368-987479

Propchange: directory/apacheds/branches/apacheds-codec-merge/core-jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 13:01:59 2010
@@ -1,2 +1,2 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/core-jndi:980138-980935
-/directory/apacheds/trunk/core-jndi:980025-980137,982368-982968
+/directory/apacheds/trunk/core-jndi:980025-980137,982368-987479

Modified: directory/apacheds/branches/apacheds-codec-merge/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java?rev=987491&r1=987490&r2=987491&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
(original)
+++ directory/apacheds/branches/apacheds-codec-merge/core/src/main/java/org/apache/directory/server/core/authn/SimpleAuthenticator.java
Fri Aug 20 13:01:59 2010
@@ -293,18 +293,6 @@ public class SimpleAuthenticator extends
         // Get the stored password, either from cache or from backend
         byte[] storedPassword = principal.getUserPassword();
 
-        // Short circuit for PLAIN TEXT passwords : we compare the byte array directly
-        // Are the passwords equal ?
-        if ( Arrays.equals( credentials, storedPassword ) )
-        {
-            if ( IS_DEBUG )
-            {
-                LOG.debug( "{} Authenticated", bindContext.getDn() );
-            }
-
-            return principal;
-        }
-
         // Let's see if the stored password was encrypted
         LdapSecurityConstants algorithm = PasswordUtil.findAlgorithm( storedPassword );
 
@@ -343,10 +331,24 @@ public class SimpleAuthenticator extends
         }
         else
         {
-            // Bad password ...
-            String message = I18n.err( I18n.ERR_230, bindContext.getDn().getName() );
-            LOG.info( message );
-            throw new LdapAuthenticationException( message );
+            // PLAIN TEXT passwords : we compare the byte array directly
+            // Are the passwords equal ?
+            if ( Arrays.equals( credentials, storedPassword ) )
+            {
+                if ( IS_DEBUG )
+                {
+                    LOG.debug( "{} Authenticated", bindContext.getDn() );
+                }
+
+                return principal;
+            }
+            else
+            {
+                // Bad password ...
+                String message = I18n.err( I18n.ERR_230, bindContext.getDn().getName() );
+                LOG.info( message );
+                throw new LdapAuthenticationException( message );
+            }
         }
     }
 

Propchange: directory/apacheds/branches/apacheds-codec-merge/i18n/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 13:01:59 2010
@@ -1,2 +1,2 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/i18n:980138-980935
-/directory/apacheds/trunk/i18n:980025-980137,982368-982970
+/directory/apacheds/trunk/i18n:980025-980137,982368-987479



Mime
View raw message