You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by pl...@apache.org on 2015/06/26 04:53:34 UTC

directory-kerby git commit: Some clean up and add getKdcHost in SimpleKdcServer.

Repository: directory-kerby
Updated Branches:
  refs/heads/master 2b7a812b7 -> 9019cd157


Some clean up and add getKdcHost in SimpleKdcServer.


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

Branch: refs/heads/master
Commit: 9019cd1573992e65139129a368d8f77d48afde99
Parents: 2b7a812
Author: plusplusjiajia <ji...@intel.com>
Authored: Fri Jun 26 10:58:24 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Fri Jun 26 10:58:24 2015 +0800

----------------------------------------------------------------------
 .../apache/kerby/kerberos/kerb/client/request/KdcRequest.java  | 6 ------
 .../org/apache/kerby/kerberos/kerb/server/SimpleKdcServer.java | 4 ++++
 2 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/9019cd15/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/KdcRequest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/KdcRequest.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/KdcRequest.java
index e017376..d66dd3e 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/KdcRequest.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/KdcRequest.java
@@ -142,10 +142,6 @@ public abstract class KdcRequest {
         return preauthContext;
     }
 
-    protected void loadCredCache() {
-        // TODO
-    }
-
     public KdcReq getKdcReq() {
         return kdcReq;
     }
@@ -297,8 +293,6 @@ public abstract class KdcRequest {
     }
 
     protected void preauth() throws KrbException {
-        loadCredCache();
-
         List<EncryptionType> etypes = getEncryptionTypes();
         if (etypes.isEmpty()) {
             throw new KrbException("No encryption type is configured and available");

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/9019cd15/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/server/SimpleKdcServer.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/server/SimpleKdcServer.java b/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/server/SimpleKdcServer.java
index fb6fe95..bd9beeb 100644
--- a/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/server/SimpleKdcServer.java
+++ b/kerby-kerb/kerb-simplekdc/src/main/java/org/apache/kerby/kerberos/kerb/server/SimpleKdcServer.java
@@ -73,6 +73,10 @@ public class SimpleKdcServer extends KdcServer {
         return getSetting().getKdcRealm();
     }
 
+    public String getKdcHost() {
+        return getSetting().getKdcHost();
+    }
+
     public void createPrincipal(String principal) throws KrbException {
         kadmin.addPrincipal(principal);
     }