directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject [3/3] directory-kerby git commit: DIRKRB-692 - This closes #29.
Date Mon, 12 Feb 2018 11:45:30 GMT
DIRKRB-692 - This closes #29.


Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/d65562fe
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/d65562fe
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/d65562fe

Branch: refs/heads/1.1.x-fixes
Commit: d65562fe0e45ba016d782eeb12e97eb149388f63
Parents: bc2bac5
Author: Colm O hEigeartaigh <coheigea@apache.org>
Authored: Mon Feb 12 11:24:49 2018 +0000
Committer: Colm O hEigeartaigh <coheigea@apache.org>
Committed: Mon Feb 12 11:41:30 2018 +0000

----------------------------------------------------------------------
 .../org/apache/kerby/kerberos/kerb/client/KrbClientBase.java   | 2 +-
 .../kerberos/kerb/client/impl/AbstractInternalKrbClient.java   | 6 +++---
 .../org/apache/kerby/kerberos/kerb/server/CacheFileTest.java   | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/d65562fe/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbClientBase.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbClientBase.java
b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbClientBase.java
index 995df5c..08fd14f 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbClientBase.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbClientBase.java
@@ -271,7 +271,7 @@ public class KrbClientBase {
      */
     public void storeTicket(SgtTicket sgtTicket, File ccacheFile) throws KrbException {
         LOG.info("Storing the sgt to the credential cache file.");
-        boolean createCache = !ccacheFile.exists() || (ccacheFile.length() == 0);
+        boolean createCache = !ccacheFile.exists() || ccacheFile.length() == 0;
 
         if (createCache) {
             createCacheFile(ccacheFile);

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/d65562fe/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/impl/AbstractInternalKrbClient.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/impl/AbstractInternalKrbClient.java
b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/impl/AbstractInternalKrbClient.java
index c1f0732..113618e 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/impl/AbstractInternalKrbClient.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/impl/AbstractInternalKrbClient.java
@@ -158,7 +158,7 @@ public abstract class AbstractInternalKrbClient implements InternalKrbClient
{
             String sourceRealm = tgtTicket.getRealm();
             String destRealm = serverPrincipalName.getRealm();
             clientPrincipalName = tgtTicket.getClientPrincipal();
-            
+
             if (!sourceRealm.equals(destRealm)) {
                 KrbConfig krbConfig = krbSetting.getKrbConfig();
                 LinkedList<String> capath = krbConfig.getCapath(sourceRealm, destRealm);
@@ -172,7 +172,7 @@ public abstract class AbstractInternalKrbClient implements InternalKrbClient
{
                     tgsRequest = new TgsRequestWithTgt(context, sgtTicket);
                 }
             }
-            
+
         } else {
             //This code is for the no-tgt case but works only with CLIENT_PRINCIPAL option
             //Should be expanded later to encompass more use-cases
@@ -186,7 +186,7 @@ public abstract class AbstractInternalKrbClient implements InternalKrbClient
{
         tgsRequest.setRequestOptions(requestOptions);
         SgtTicket sgtTicket = doRequestSgt(tgsRequest);
 
-        if (clientPrincipalName!=null) {
+        if (clientPrincipalName != null) {
             sgtTicket.setClientPrincipal(clientPrincipalName);
         }
 

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/d65562fe/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/CacheFileTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/CacheFileTest.java
b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/CacheFileTest.java
index ebc40db..d73d959 100644
--- a/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/CacheFileTest.java
+++ b/kerby-kerb/kerb-kdc-test/src/test/java/org/apache/kerby/kerberos/kerb/server/CacheFileTest.java
@@ -27,7 +27,6 @@ import org.apache.kerby.kerberos.kerb.type.ticket.SgtTicket;
 import org.apache.kerby.kerberos.kerb.type.ticket.TgtTicket;
 import org.junit.Test;
 
-@org.junit.Ignore("See DIRKRB-692")
 public class CacheFileTest extends KdcTestBase {
 
     @Test
@@ -52,4 +51,4 @@ public class CacheFileTest extends KdcTestBase {
             t.printStackTrace();
         }
     }
-}
\ No newline at end of file
+}


Mime
View raw message