directory-commits mailing list archives

Author: erodriguez
Date: Sun Mar 18 20:27:20 2007
New Revision: 519814

URL: http://svn.apache.org/viewvc?view=rev&rev=519814
Log:
Updated JNDI authentication for Kerberos protocol provider to use parameters from Spring configuration
as opposed to properties.

Modified:
    directory/apacheds/branches/apacheds-sasl-branch/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/SingleBaseSearch.java

Modified: directory/apacheds/branches/apacheds-sasl-branch/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/SingleBaseSearch.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-sasl-branch/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/SingleBaseSearch.java?view=diff&rev=519814&r1=519813&r2=519814
==============================================================================
--- directory/apacheds/branches/apacheds-sasl-branch/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/SingleBaseSearch.java
(original)
+++ directory/apacheds/branches/apacheds-sasl-branch/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/store/SingleBaseSearch.java
Sun Mar 18 20:27:20 2007
@@ -50,15 +50,18 @@
 class SingleBaseSearch implements PrincipalStore
 {
     private DirContext ctx;
-    private Hashtable<String, String> env;
+    private Hashtable<String, Object> env;
     private InitialContextFactory factory;
 
 
     SingleBaseSearch( ServiceConfiguration config, InitialContextFactory factory )
     {
-        env = new Hashtable<String, String>( config.toJndiEnvironment() );
+        env = new Hashtable<String, Object>( config.toJndiEnvironment() );
         env.put( Context.INITIAL_CONTEXT_FACTORY, config.getInitialContextFactory() );
-        env.put( Context.PROVIDER_URL, config.getEntryBaseDn() );
+        env.put( Context.PROVIDER_URL, config.getSearchBaseDn() );
+        env.put( Context.SECURITY_AUTHENTICATION, config.getSecurityAuthentication() );
+        env.put( Context.SECURITY_CREDENTIALS, config.getSecurityCredentials() );
+        env.put( Context.SECURITY_PRINCIPAL, config.getSecurityPrincipal() );
 
         this.factory = factory;
     }