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/12/25 09:18:31 UTC
directory-kerby git commit: DIRKRB-513 Enable kinit tool kdc flag
options.
Repository: directory-kerby
Updated Branches:
refs/heads/master d6bf76c13 -> 4e963c3af
DIRKRB-513 Enable kinit tool kdc flag options.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/4e963c3a
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/4e963c3a
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/4e963c3a
Branch: refs/heads/master
Commit: 4e963c3af84317e3d76f18c4acd6fa04bd6fe9ac
Parents: d6bf76c
Author: plusplusjiajia <ji...@intel.com>
Authored: Fri Dec 25 16:24:50 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Fri Dec 25 16:24:50 2015 +0800
----------------------------------------------------------------------
.../kerby/kerberos/kerb/client/KrbKdcOption.java | 14 +++++++-------
.../kerberos/kerb/client/request/KdcRequest.java | 8 ++++----
2 files changed, 11 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4e963c3a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbKdcOption.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbKdcOption.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbKdcOption.java
index 1a8306f..4c29394 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbKdcOption.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbKdcOption.java
@@ -29,21 +29,21 @@ public enum KrbKdcOption implements KOption {
NONE(null),
/* KDC flags */
- FORWARDABLE(new KOptionInfo("forwardable", "forwardable",
+ FORWARDABLE(new KOptionInfo("-f", "forwardable",
KrbOptionGroup.KDC_FLAGS)),
- PROXIABLE(new KOptionInfo("proxiable", "proxiable",
+ PROXIABLE(new KOptionInfo("-p", "proxiable",
KrbOptionGroup.KDC_FLAGS)),
- REQUEST_ANONYMOUS(new KOptionInfo("request-anonymous",
+ REQUEST_ANONYMOUS(new KOptionInfo("-n",
"request anonymous", KrbOptionGroup.KDC_FLAGS)),
- VALIDATE(new KOptionInfo("validate", "validate",
+ VALIDATE(new KOptionInfo("-v", "validate",
KrbOptionGroup.KDC_FLAGS)),
- RENEW(new KOptionInfo("renew", "renew",
+ RENEW(new KOptionInfo("-R", "renew",
KrbOptionGroup.KDC_FLAGS)),
- RENEWABLE(new KOptionInfo("renewable", "renewable",
+ RENEWABLE(new KOptionInfo("-r", "renewable-life",
KrbOptionGroup.KDC_FLAGS)),
RENEWABLE_OK(new KOptionInfo("renewable-ok", "renewable ok",
KrbOptionGroup.KDC_FLAGS)),
- CANONICALIZE(new KOptionInfo("canonicalize", "canonicalize",
+ CANONICALIZE(new KOptionInfo("-C", "canonicalize",
KrbOptionGroup.KDC_FLAGS)),
ANONYMOUS(new KOptionInfo("-n", "anonymous",
KrbOptionGroup.KDC_FLAGS));
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/4e963c3a/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 08ca20b..32e0db2 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
@@ -23,7 +23,7 @@ import org.apache.kerby.KOption;
import org.apache.kerby.KOptions;
import org.apache.kerby.kerberos.kerb.KrbException;
import org.apache.kerby.kerberos.kerb.client.KrbContext;
-import org.apache.kerby.kerberos.kerb.client.KrbOption;
+import org.apache.kerby.kerberos.kerb.client.KrbKdcOption;
import org.apache.kerby.kerberos.kerb.client.KrbOptionGroup;
import org.apache.kerby.kerberos.kerb.client.preauth.KrbFastRequestState;
import org.apache.kerby.kerberos.kerb.client.preauth.PreauthContext;
@@ -412,9 +412,9 @@ public abstract class KdcRequest {
for (KOption kOpt: requestOptions.getOptions()) {
if (kOpt.getOptionInfo().getGroup() == KrbOptionGroup.KDC_FLAGS) {
- KrbOption krbOption = (KrbOption) kOpt;
- KdcOption kdcOption = KdcOption.valueOf(krbOption.name());
- boolean flagValue = requestOptions.getBooleanOption(kOpt, false);
+ KrbKdcOption krbKdcOption = (KrbKdcOption) kOpt;
+ KdcOption kdcOption = KdcOption.valueOf(krbKdcOption.name());
+ boolean flagValue = requestOptions.getBooleanOption(kOpt, true);
kdcOptions.setFlag(kdcOption, flagValue);
}
}