svn commit: rev 56112 - incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/kdc

[erodriguez]

Author: erodriguez
Date: Sat Oct 30 19:38:40 2004
New Revision: 56112

Modified:
   
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/kdc/AuthenticationService.java
   
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/kdc/KdcDispatcher.java
   
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/kdc/TicketGrantingService.java
Log:
Fixed minor bug where I was instantiating two bootstrap stores when I only need 
one.

Modified: 
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/kdc/AuthenticationService.java
==============================================================================
--- 
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/kdc/AuthenticationService.java
   (original)
+++ 
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/kdc/AuthenticationService.java
   Sat Oct 30 19:38:40 2004
@@ -28,10 +28,11 @@
 public class AuthenticationService {
        
        private PrincipalStore _store;
-       private PrincipalStore _bootstrap = new KdcBootstrapStore();
+       private PrincipalStore _bootstrap;
        
-       public AuthenticationService(PrincipalStore store) {
-               _store = store;
+       public AuthenticationService(PrincipalStore store, PrincipalStore 
bootstrap) {
+               _store     = store;
+               _bootstrap = bootstrap;
        }
        
        public AuthenticationReply getReplyFor(KdcRequest request) throws 
KerberosException {

Modified: 
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/kdc/KdcDispatcher.java
==============================================================================
--- 
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/kdc/KdcDispatcher.java
   (original)
+++ 
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/kdc/KdcDispatcher.java
   Sat Oct 30 19:38:40 2004
@@ -36,14 +36,16 @@
        private static final KdcRequestDecoder decoder = new 
KdcRequestDecoder();
        private static final KdcReplyEncoder   encoder = new KdcReplyEncoder();
        
+       private static final PrincipalStore bootstrap = new KdcBootstrapStore();
+       
        private AuthenticationService _authService;
        private TicketGrantingService _tgsService;
        private PrincipalStore _store;
        
        public KdcDispatcher(PrincipalStore store) {
                _store       = store;
-               _authService = new AuthenticationService(_store);
-               _tgsService  = new TicketGrantingService(_store, replay);
+               _authService = new AuthenticationService(_store, bootstrap);
+               _tgsService  = new TicketGrantingService(_store, bootstrap, 
replay);
        }
        
        public byte[] dispatch(byte[] requestBytes) throws IOException, 
KerberosException {

Modified: 
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/kdc/TicketGrantingService.java
==============================================================================
--- 
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/kdc/TicketGrantingService.java
   (original)
+++ 
incubator/directory/kerberos/trunk/source/main/org/apache/kerberos/kdc/TicketGrantingService.java
   Sat Oct 30 19:38:40 2004
@@ -38,11 +38,12 @@
 public class TicketGrantingService {
        
        private PrincipalStore _store;
-       private PrincipalStore _bootstrap = new KdcBootstrapStore();
+       private PrincipalStore _bootstrap;
        private ReplayCache    _replayCache;
        
-       public TicketGrantingService(PrincipalStore store, ReplayCache replay) {
+       public TicketGrantingService(PrincipalStore store, PrincipalStore 
bootstrap, ReplayCache replay) {
                _store       = store;
+               _bootstrap   = bootstrap;
                _replayCache = replay;
        }