directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1042059 - in /directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src: main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/ test/java/org/apache/directory/server/kerberos/protocol/
Date Sat, 04 Dec 2010 00:10:21 GMT
Author: elecharny
Date: Sat Dec  4 00:10:21 2010
New Revision: 1042059

URL: http://svn.apache.org/viewvc?rev=1042059&view=rev
Log:
Solved some compilation errors

Modified:
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingService.java
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AbstractTicketGrantingServiceTest.java
    directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingServiceTest.java

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingService.java?rev=1042059&r1=1042058&r2=1042059&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingService.java
(original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/main/java/org/apache/directory/server/kerberos/kdc/ticketgrant/TicketGrantingService.java
Sat Dec  4 00:10:21 2010
@@ -695,7 +695,26 @@ public class TicketGrantingService
             newTicketBody.clearFlag( TicketFlag.INVALID );
         }
 
-        if ( request.getOption( KdcOptions.RESERVED ) )
+        if ( request.getOption( KdcOptions.RESERVED_0 ) || 
+             request.getOption( KdcOptions.RESERVED_7 ) ||
+             request.getOption( KdcOptions.RESERVED_9 ) ||
+             request.getOption( KdcOptions.RESERVED_10 ) ||
+             request.getOption( KdcOptions.RESERVED_11 ) ||
+             request.getOption( KdcOptions.RESERVED_12 ) ||
+             request.getOption( KdcOptions.RESERVED_13 ) ||
+             request.getOption( KdcOptions.RESERVED_14 ) ||
+             request.getOption( KdcOptions.RESERVED_15 ) ||
+             request.getOption( KdcOptions.RESERVED_16 ) ||
+             request.getOption( KdcOptions.RESERVED_17 ) ||
+             request.getOption( KdcOptions.RESERVED_18 ) ||
+             request.getOption( KdcOptions.RESERVED_19 ) ||
+             request.getOption( KdcOptions.RESERVED_20 ) ||
+             request.getOption( KdcOptions.RESERVED_21 ) ||
+             request.getOption( KdcOptions.RESERVED_22 ) ||
+             request.getOption( KdcOptions.RESERVED_23 ) ||
+             request.getOption( KdcOptions.RESERVED_24 ) ||
+             request.getOption( KdcOptions.RESERVED_25 ) ||
+             request.getOption( KdcOptions.RESERVED_29 ) )
         {
             throw new KerberosException( ErrorType.KDC_ERR_BADOPTION );
         }

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AbstractTicketGrantingServiceTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AbstractTicketGrantingServiceTest.java?rev=1042059&r1=1042058&r2=1042059&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AbstractTicketGrantingServiceTest.java
(original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/AbstractTicketGrantingServiceTest.java
Sat Dec  4 00:10:21 2010
@@ -35,12 +35,9 @@ import org.apache.directory.server.kerbe
 import org.apache.directory.server.kerberos.shared.messages.ApplicationRequest;
 import org.apache.directory.server.kerberos.shared.messages.KdcRequest;
 import org.apache.directory.server.kerberos.shared.messages.components.EncTicketPartModifier;
-import org.apache.directory.server.kerberos.shared.messages.value.ApOptions;
-import org.apache.directory.shared.kerberos.components.KdcReqBody;
-import org.apache.directory.server.kerberos.shared.messages.value.flags.TicketFlag;
-import org.apache.directory.server.kerberos.shared.messages.value.flags.TicketFlags;
 import org.apache.directory.shared.kerberos.KerberosMessageType;
 import org.apache.directory.shared.kerberos.KerberosTime;
+import org.apache.directory.shared.kerberos.codec.options.ApOptions;
 import org.apache.directory.shared.kerberos.codec.types.EncryptionType;
 import org.apache.directory.shared.kerberos.codec.types.PaDataType;
 import org.apache.directory.shared.kerberos.codec.types.PrincipalNameType;
@@ -52,6 +49,8 @@ import org.apache.directory.shared.kerbe
 import org.apache.directory.shared.kerberos.components.PrincipalName;
 import org.apache.directory.shared.kerberos.components.TransitedEncoding;
 import org.apache.directory.shared.kerberos.crypto.checksum.ChecksumType;
+import org.apache.directory.shared.kerberos.flags.TicketFlag;
+import org.apache.directory.shared.kerberos.flags.TicketFlags;
 import org.apache.directory.shared.kerberos.messages.Authenticator;
 import org.apache.directory.shared.kerberos.messages.Ticket;
 

Modified: directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingServiceTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingServiceTest.java?rev=1042059&r1=1042058&r2=1042059&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingServiceTest.java
(original)
+++ directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos/src/test/java/org/apache/directory/server/kerberos/protocol/TicketGrantingServiceTest.java
Sat Dec  4 00:10:21 2010
@@ -54,8 +54,7 @@ import org.apache.directory.shared.kerbe
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
-</a>
- */
+
 public class TicketGrantingServiceTest extends AbstractTicketGrantingServiceTest
 {
     private KdcServer config;



Mime
View raw message