directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kayyag...@apache.org
Subject svn commit: r1589929 - in /directory/apacheds/trunk/kerberos-codec/src: main/java/org/apache/directory/server/kerberos/shared/keytab/ test/java/org/apache/directory/server/kerberos/shared/keytab/
Date Fri, 25 Apr 2014 05:47:14 GMT
Author: kayyagari
Date: Fri Apr 25 05:47:14 2014
New Revision: 1589929

URL: http://svn.apache.org/r1589929
Log:
o changed the principalType to int
o fixed test

Modified:
    directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabDecoder.java
    directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabEncoder.java
    directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabEntry.java
    directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/keytab/KeytabTest.java

Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabDecoder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabDecoder.java?rev=1589929&r1=1589928&r2=1589929&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabDecoder.java
(original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabDecoder.java
Fri Apr 25 05:47:14 2014
@@ -82,7 +82,7 @@ class KeytabDecoder
     {
         String principalName = getPrincipalName( buffer );
 
-        long principalType = buffer.getInt();
+        int principalType = buffer.getInt();
 
         long time = buffer.getInt();
         KerberosTime timeStamp = new KerberosTime( time * 1000 );

Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabEncoder.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabEncoder.java?rev=1589929&r1=1589928&r2=1589929&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabEncoder.java
(original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabEncoder.java
Fri Apr 25 05:47:14 2014
@@ -33,7 +33,7 @@ import org.apache.directory.shared.kerbe
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-class KeytabEncoder
+public class KeytabEncoder
 {
     /**
      * Tells if the keytabCersion is 0x0501 or 0x0502
@@ -66,7 +66,7 @@ class KeytabEncoder
      * @param entries
      * @return The ByteBuffer.
      */
-    ByteBuffer write( byte[] keytabVersion, List<KeytabEntry> entries )
+    public ByteBuffer write( byte[] keytabVersion, List<KeytabEntry> entries )
     {
         List<ByteBuffer> keytabEntryBuffers = new ArrayList<ByteBuffer>();;
         short version = getKeytabVersion( keytabVersion );

Modified: directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabEntry.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabEntry.java?rev=1589929&r1=1589928&r2=1589929&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabEntry.java
(original)
+++ directory/apacheds/trunk/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/shared/keytab/KeytabEntry.java
Fri Apr 25 05:47:14 2014
@@ -33,7 +33,7 @@ public class KeytabEntry
 {
     private String principalName;
 
-    private long principalType;
+    private int principalType;
 
     private KerberosTime timeStamp;
 
@@ -51,7 +51,7 @@ public class KeytabEntry
      * @param keyVersion
      * @param key
      */
-    public KeytabEntry( String principalName, long principalType, KerberosTime timeStamp,
byte keyVersion,
+    public KeytabEntry( String principalName, int principalType, KerberosTime timeStamp,
byte keyVersion,
         EncryptionKey key )
     {
         this.principalName = principalName;
@@ -92,7 +92,7 @@ public class KeytabEntry
     /**
      * @return The principalType.
      */
-    public long getPrincipalType()
+    public int getPrincipalType()
     {
         return principalType;
     }

Modified: directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/keytab/KeytabTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/keytab/KeytabTest.java?rev=1589929&r1=1589928&r2=1589929&view=diff
==============================================================================
--- directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/keytab/KeytabTest.java
(original)
+++ directory/apacheds/trunk/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/keytab/KeytabTest.java
Fri Apr 25 05:47:14 2014
@@ -163,7 +163,7 @@ public class KeytabTest
     private KeytabEntry getEntry1() throws ParseException
     {
         String principalName = "HTTP/www.verisign.com@EXAMPLE.COM";
-        long principalType = 1;
+        int principalType = 1;
 
         String zuluTime = "20070217235745Z";
         Date date = null;



Mime
View raw message