directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From erodrig...@apache.org
Subject svn commit: r516178 - in /directory/apacheds/branches/apacheds-sasl-branch/server-sasl: pom.xml src/main/java/org/apache/directory/server/sasl/SaslBindHandler.java
Date Thu, 08 Mar 2007 21:17:52 GMT
Author: erodriguez
Date: Thu Mar  8 13:17:52 2007
New Revision: 516178

URL: http://svn.apache.org/viewvc?view=rev&rev=516178
Log:
Checking in some fixes to make the old server-sasl module at least build.

Modified:
    directory/apacheds/branches/apacheds-sasl-branch/server-sasl/pom.xml
    directory/apacheds/branches/apacheds-sasl-branch/server-sasl/src/main/java/org/apache/directory/server/sasl/SaslBindHandler.java

Modified: directory/apacheds/branches/apacheds-sasl-branch/server-sasl/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/server-sasl/pom.xml?view=diff&rev=516178&r1=516177&r2=516178
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/server-sasl/pom.xml (original)
+++ directory/apacheds/branches/apacheds-sasl-branch/server-sasl/pom.xml Thu Mar  8 13:17:52
2007
@@ -21,6 +21,7 @@
     <dependency>
       <groupId>org.apache.directory.shared</groupId>
       <artifactId>shared-ldap</artifactId>
+      <version>0.9.6-SNAPSHOT</version>
     </dependency>
     <dependency>
       <groupId>org.apache.directory.server</groupId>
@@ -39,8 +40,9 @@
       <scope>test</scope>
     </dependency>
     <dependency>
-      <groupId>org.apache.directory.mina</groupId>
+      <groupId>org.apache.mina</groupId>
       <artifactId>mina-filter-ssl</artifactId>
+      <version>1.0.1</version>
     </dependency>
   </dependencies>
 </project>

Modified: directory/apacheds/branches/apacheds-sasl-branch/server-sasl/src/main/java/org/apache/directory/server/sasl/SaslBindHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/server-sasl/src/main/java/org/apache/directory/server/sasl/SaslBindHandler.java?view=diff&rev=516178&r1=516177&r2=516178
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/server-sasl/src/main/java/org/apache/directory/server/sasl/SaslBindHandler.java
(original)
+++ directory/apacheds/branches/apacheds-sasl-branch/server-sasl/src/main/java/org/apache/directory/server/sasl/SaslBindHandler.java
Thu Mar  8 13:17:52 2007
@@ -53,7 +53,7 @@
         LdapContext ctx;
         BindRequest req = ( BindRequest ) message;
         LdapResult result = req.getResultResponse().getLdapResult();
-        Hashtable env = SessionRegistry.getSingleton().getEnvironment();
+        Hashtable env = SessionRegistry.getSingleton().getEnvironmentByCopy();
 
         // If the bind request is simple, then forward the request to the
         // original BindHandler implementation.
@@ -77,7 +77,7 @@
             }
             else
             {
-                result.setResultCode( ResultCodeEnum.AUTHMETHODNOTSUPPORTED );
+                result.setResultCode( ResultCodeEnum.AUTH_METHOD_NOT_SUPPORTED );
                 result.setErrorMessage( "Unsupported SASL mechanism: " + mechanism );
                 session.write( req.getResultResponse() );
                 return;
@@ -95,7 +95,7 @@
             // Return the challenge if not complete
             if( !saslServer.isComplete() )
             {
-                result.setResultCode( ResultCodeEnum.SASLBINDINPROGRESS );
+                result.setResultCode( ResultCodeEnum.SASL_BIND_IN_PROGRESS );
                 BindResponse response = ( BindResponse ) req.getResultResponse();
                 response.setServerSaslCreds( challenge );
                 session.write( req.getResultResponse() );



Mime
View raw message