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 2017/09/14 12:54:58 UTC
[6/6] directory-kerby git commit: DIRKRB-656 Compatibility problem
with Kerberos when getting service ticket. Contributed by Frank Zeng.
DIRKRB-656 Compatibility problem with Kerberos when getting service ticket. Contributed by Frank Zeng.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/2b0e5692
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/2b0e5692
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/2b0e5692
Branch: refs/heads/cross-realm
Commit: 2b0e56920d935c00b4a7bd6a90e93dafd11254cc
Parents: 276905d
Author: plusplusjiajia <ji...@intel.com>
Authored: Tue Sep 12 11:29:54 2017 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Tue Sep 12 11:29:54 2017 +0800
----------------------------------------------------------------------
.../org/apache/kerby/kerberos/kerb/client/KrbClientBase.java | 6 ++++--
.../java/org/apache/kerby/kerberos/kerb/client/KrbHandler.java | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/2b0e5692/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 cc05a25..602024a 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
@@ -222,12 +222,14 @@ public class KrbClientBase {
public SgtTicket requestSgt(File ccFile, String servicePrincipal) throws KrbException {
Credential credential = getCredentialFromFile(ccFile);
TgtTicket tgt = getTgtTicketFromCredential(credential);
+ KOptions requestOptions = new KOptions();
+
+ // Renew ticket if argument named servicePrincipal is null
if (servicePrincipal == null) {
+ requestOptions.add(KrbKdcOption.RENEW);
servicePrincipal = credential.getServicePrincipal().getName();
}
- KOptions requestOptions = new KOptions();
- requestOptions.add(KrbKdcOption.RENEW);
requestOptions.add(KrbOption.USE_TGT, tgt);
requestOptions.add(KrbOption.SERVER_PRINCIPAL, servicePrincipal);
SgtTicket sgtTicket = innerClient.requestSgt(requestOptions);
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/2b0e5692/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbHandler.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbHandler.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbHandler.java
index 32fad41..81dc163 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbHandler.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbHandler.java
@@ -93,7 +93,7 @@ public abstract class KrbHandler {
}
/**
- * Process the response messabe from kdc.
+ * Process the response message from kdc.
*
* @param kdcRequest The kdc request
* @param responseMessage The message from kdc