Author: erodriguez
Date: Sat Nov 6 21:59:15 2004
New Revision: 56815
Modified:
incubator/directory/kerberos/trunk/kerberos/src/java/org/apache/kerberos/changepw/store/LdapPasswordStore.java
incubator/directory/kerberos/trunk/kerberos/src/java/org/apache/kerberos/kdc/store/LdapStore.java
Log:
Renaming login configurations to differentiate from other configuration classes.
Modified:
incubator/directory/kerberos/trunk/kerberos/src/java/org/apache/kerberos/changepw/store/LdapPasswordStore.java
==============================================================================
---
incubator/directory/kerberos/trunk/kerberos/src/java/org/apache/kerberos/changepw/store/LdapPasswordStore.java
(original)
+++
incubator/directory/kerberos/trunk/kerberos/src/java/org/apache/kerberos/changepw/store/LdapPasswordStore.java
Sat Nov 6 21:59:15 2004
@@ -16,18 +16,21 @@
*/
package org.apache.kerberos.changepw.store;
-import org.apache.kerberos.kdc.*;
-import org.apache.kerberos.kdc.jaas.*;
-import org.apache.kerberos.kdc.store.*;
-import org.apache.kerberos.messages.value.*;
+import org.apache.kerberos.kdc.KdcConfiguration;
+import org.apache.kerberos.kdc.jaas.KdcLoginConfiguration;
+import org.apache.kerberos.kdc.store.BootstrapStore;
+import org.apache.kerberos.messages.value.EncryptionKey;
-import java.security.*;
-
-import javax.naming.*;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
import javax.naming.directory.*;
-import javax.security.auth.*;
-import javax.security.auth.kerberos.*;
-import javax.security.auth.login.*;
+import javax.security.auth.Subject;
+import javax.security.auth.kerberos.KerberosKey;
+import javax.security.auth.kerberos.KerberosPrincipal;
+import javax.security.auth.login.Configuration;
+import javax.security.auth.login.LoginContext;
+import javax.security.auth.login.LoginException;
+import java.security.PrivilegedAction;
public class LdapPasswordStore implements PasswordStore {
@@ -66,7 +69,7 @@
_subject.getPrincipals().add(principal);
_subject.getPrivateCredentials().add(key);
- Configuration.setConfiguration(new Krb5Configuration());
+ Configuration.setConfiguration(new KdcLoginConfiguration());
LoginContext lc = null;
try {
Modified:
incubator/directory/kerberos/trunk/kerberos/src/java/org/apache/kerberos/kdc/store/LdapStore.java
==============================================================================
---
incubator/directory/kerberos/trunk/kerberos/src/java/org/apache/kerberos/kdc/store/LdapStore.java
(original)
+++
incubator/directory/kerberos/trunk/kerberos/src/java/org/apache/kerberos/kdc/store/LdapStore.java
Sat Nov 6 21:59:15 2004
@@ -16,17 +16,20 @@
*/
package org.apache.kerberos.kdc.store;
-import org.apache.kerberos.kdc.*;
-import org.apache.kerberos.kdc.jaas.*;
-import org.apache.kerberos.messages.value.*;
+import org.apache.kerberos.kdc.KdcConfiguration;
+import org.apache.kerberos.kdc.jaas.KdcLoginConfiguration;
+import org.apache.kerberos.messages.value.EncryptionKey;
-import java.security.*;
-
-import javax.naming.*;
+import javax.naming.NamingEnumeration;
+import javax.naming.NamingException;
import javax.naming.directory.*;
-import javax.security.auth.*;
-import javax.security.auth.kerberos.*;
-import javax.security.auth.login.*;
+import javax.security.auth.Subject;
+import javax.security.auth.kerberos.KerberosKey;
+import javax.security.auth.kerberos.KerberosPrincipal;
+import javax.security.auth.login.Configuration;
+import javax.security.auth.login.LoginContext;
+import javax.security.auth.login.LoginException;
+import java.security.PrivilegedAction;
public class LdapStore implements PrincipalStore {
@@ -65,7 +68,7 @@
_subject.getPrincipals().add(principal);
_subject.getPrivateCredentials().add(key);
- Configuration.setConfiguration(new Krb5Configuration());
+ Configuration.setConfiguration(new KdcLoginConfiguration());
LoginContext lc = null;
try {
