svn commit: r179357 - in /directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/store: KerberosAttribute.java operations/GetPrincipal.java

[ak...@apache.org]

Author: akarasulu
Date: Tue May 31 22:11:18 2005
New Revision: 179357

URL: http://svn.apache.org/viewcvs?rev=179357&view=rev
Log:
changes ...

Added the Apache specific SAM type extension attribute to the list of attributes
in the JNDI search for the user entry.  This was not being looked up and 
was resulting in the bypassing of the SamSubsystem all together.  Now we have
an additional attribute type defined and the GetPrincipal operation actually
retrieves it.


Modified:
    directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/store/KerberosAttribute.java
    directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/store/operations/GetPrincipal.java

Modified: directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/store/KerberosAttribute.java
URL: http://svn.apache.org/viewcvs/directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/store/KerberosAttribute.java?rev=179357&r1=179356&r2=179357&view=diff
==============================================================================
--- directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/store/KerberosAttribute.java (original)
+++ directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/store/KerberosAttribute.java Tue May 31 22:11:18 2005
@@ -32,5 +32,7 @@
     public static final String PRINCIPAL = "krb5PrincipalName";
     /** the krb5kdc schema key version identifier for a krb5KDCEntry */
     public static final String VERSION   = "krb5KeyVersionNumber";
+    /** the krb5kdc schema key version identifier for a krb5KDCEntry */
+    public static final String SAM_TYPE   = "apacheSamType";
 }
 

Modified: directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/store/operations/GetPrincipal.java
URL: http://svn.apache.org/viewcvs/directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/store/operations/GetPrincipal.java?rev=179357&r1=179356&r2=179357&view=diff
==============================================================================
--- directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/store/operations/GetPrincipal.java (original)
+++ directory/shared/kerberos/trunk/common/src/java/org/apache/kerberos/store/operations/GetPrincipal.java Tue May 31 22:11:18 2005
@@ -79,7 +79,7 @@
 
             KerberosAttribute.PRINCIPAL,  KerberosAttribute.VERSION,
 
-            KerberosAttribute.TYPE,  KerberosAttribute.KEY
+            KerberosAttribute.TYPE,  KerberosAttribute.KEY, KerberosAttribute.SAM_TYPE
         };
 
 		Attributes matchAttrs = new BasicAttributes( false ); // case-sensitive
@@ -136,9 +136,9 @@
 
         String keyVersionNumber = ( String ) attrs.get( KerberosAttribute.VERSION ).get();
 
-        if ( attrs.get( "apacheSamType" ) != null )
+        if ( attrs.get( KerberosAttribute.SAM_TYPE ) != null )
         {
-            String samType = ( String ) attrs.get( "apacheSamType" ).get();
+            String samType = ( String ) attrs.get( KerberosAttribute.SAM_TYPE ).get();
 
             modifier.setSamType( SamType.getTypeByOrdinal( Integer.parseInt( samType ) ) );
         }