Author: akarasulu
Date: Wed Feb 2 09:22:56 2005
New Revision: 149536
URL: http://svn.apache.org/viewcvs?view=rev&rev=149536
Log:
changed SamVerifier interface to just use kerberos principal here - makes no
sense to keep it separate
Modified:
incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/sam/SamSubsystem.java
incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/sam/SamVerifier.java
Modified:
incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/sam/SamSubsystem.java
URL:
http://svn.apache.org/viewcvs/incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/sam/SamSubsystem.java?view=diff&r1=149535&r2=149536
==============================================================================
---
incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/sam/SamSubsystem.java
(original)
+++
incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/sam/SamSubsystem.java
Wed Feb 2 09:22:56 2005
@@ -82,9 +82,7 @@
{
verifier = ( SamVerifier ) verifiers.get( entry.getSamType() );
- String user = entry.getPrincipal().getName();
-
- return verifier.verify( user, entry.getRealmName(), sad );
+ return verifier.verify( entry.getPrincipal(), sad );
}
String key = PROPKEY_BASE + entry.getSamType().getOrdinal();
@@ -115,11 +113,9 @@
throw new SamException( entry.getSamType(), msg );
}
- String user = entry.getPrincipal().getName();
-
verifiers.put( verifier.getSamType(), verifier );
- return verifier.verify( user, entry.getRealmName(), sad );
+ return verifier.verify( entry.getPrincipal(), sad );
}
catch ( ClassNotFoundException e )
{
Modified:
incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/sam/SamVerifier.java
URL:
http://svn.apache.org/viewcvs/incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/sam/SamVerifier.java?view=diff&r1=149535&r2=149536
==============================================================================
---
incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/sam/SamVerifier.java
(original)
+++
incubator/directory/kerberos/trunk/core/src/java/org/apache/kerberos/sam/SamVerifier.java
Wed Feb 2 09:22:56 2005
@@ -18,6 +18,7 @@
import javax.security.auth.kerberos.KerberosKey;
+import javax.security.auth.kerberos.KerberosPrincipal;
/**
@@ -43,11 +44,10 @@
/**
* Verifies the single use password supplied.
*
- * @param uid the unique id of the user within an authentication domain
- * @param domain the authentication domain of the user
+ * @param principal the kerberos principal to use
* @param sad single-use authentication data (encrypted generalized
timestamp)
*/
- KerberosKey verify( String uid, String domain, byte[] sad ) throws
SamException;
+ KerberosKey verify( KerberosPrincipal principal, byte[] sad ) throws
SamException;
/**
* Gets the registered SAM algorithm type implemented by this SamVerifier.
