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/22 03:40:22 UTC

directory-kerby git commit: DIRKRB-507 Add the option group in PkinitOption.

Repository: directory-kerby
Updated Branches:
  refs/heads/master d9030f648 -> 477415ceb


DIRKRB-507 Add the option group in PkinitOption.


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

Branch: refs/heads/master
Commit: 477415ceb7d4953cc135a720a8acf3e98e2cbca2
Parents: d9030f6
Author: plusplusjiajia <ji...@intel.com>
Authored: Tue Dec 22 10:46:18 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Tue Dec 22 10:46:18 2015 +0800

----------------------------------------------------------------------
 .../kerby/kerberos/kerb/client/PkinitOption.java     | 14 +++++++-------
 .../kerby/kerberos/tool/kinit/KinitOption.java       |  3 ++-
 .../apache/kerby/kerberos/tool/kinit/KinitTool.java  | 15 ++++++++-------
 3 files changed, 17 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/477415ce/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/PkinitOption.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/PkinitOption.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/PkinitOption.java
index 969dc03..bded435 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/PkinitOption.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/PkinitOption.java
@@ -28,15 +28,15 @@ import org.apache.kerby.KOptionType;
  */
 public enum PkinitOption implements KOption {
     NONE(null),
-    USE_PKINIT(new KOptionInfo("use-pkinit", "using pkinit")),
-    X509_IDENTITY(new KOptionInfo("x509-identities", "X509 user private key and cert",
+    USE_PKINIT(new KOptionInfo("use-pkinit", "using pkinit", KrbOptionGroup.PKINIT)),
+    X509_IDENTITY(new KOptionInfo("x509-identities", "X509 user private key and cert", KrbOptionGroup.PKINIT,
         KOptionType.STR)),
-    X509_PRIVATE_KEY(new KOptionInfo("x509-privatekey", "X509 user private key",
+    X509_PRIVATE_KEY(new KOptionInfo("x509-privatekey", "X509 user private key", KrbOptionGroup.PKINIT,
         KOptionType.STR)),
-    X509_CERTIFICATE(new KOptionInfo("x509-cert", "X509 user certificate", KOptionType.STR)),
-    X509_ANCHORS(new KOptionInfo("x509-anchors", "X509 anchors", KOptionType.STR)),
-    USING_RSA(new KOptionInfo("using-rsa-or-dh", "Using RSA or DH")),
-    USE_ANONYMOUS(new KOptionInfo("use-pkinit-anonymous", "X509 anonymous"));
+    X509_CERTIFICATE(new KOptionInfo("x509-cert", "X509 user certificate", KrbOptionGroup.PKINIT, KOptionType.STR)),
+    X509_ANCHORS(new KOptionInfo("x509-anchors", "X509 anchors", KrbOptionGroup.PKINIT, KOptionType.STR)),
+    USING_RSA(new KOptionInfo("using-rsa-or-dh", "Using RSA or DH", KrbOptionGroup.PKINIT)),
+    USE_ANONYMOUS(new KOptionInfo("use-pkinit-anonymous", "X509 anonymous", KrbOptionGroup.PKINIT));
 
     private final KOptionInfo optionInfo;
 

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/477415ce/kerby-tool/client-tool/src/main/java/org/apache/kerby/kerberos/tool/kinit/KinitOption.java
----------------------------------------------------------------------
diff --git a/kerby-tool/client-tool/src/main/java/org/apache/kerby/kerberos/tool/kinit/KinitOption.java b/kerby-tool/client-tool/src/main/java/org/apache/kerby/kerberos/tool/kinit/KinitOption.java
index 00e377f..2f94768 100644
--- a/kerby-tool/client-tool/src/main/java/org/apache/kerby/kerberos/tool/kinit/KinitOption.java
+++ b/kerby-tool/client-tool/src/main/java/org/apache/kerby/kerberos/tool/kinit/KinitOption.java
@@ -93,7 +93,8 @@ public enum KinitOption implements KOption {
     public static KinitOption fromName(String name) {
         if (name != null) {
             for (KinitOption ko : values()) {
-                if (ko.name().equals(name)) {
+                if (ko.optionInfo != null
+                        && ko.optionInfo.getName().equals(name)) {
                     return ko;
                 }
             }

http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/477415ce/kerby-tool/client-tool/src/main/java/org/apache/kerby/kerberos/tool/kinit/KinitTool.java
----------------------------------------------------------------------
diff --git a/kerby-tool/client-tool/src/main/java/org/apache/kerby/kerberos/tool/kinit/KinitTool.java b/kerby-tool/client-tool/src/main/java/org/apache/kerby/kerberos/tool/kinit/KinitTool.java
index d09515f..be16c99 100644
--- a/kerby-tool/client-tool/src/main/java/org/apache/kerby/kerberos/tool/kinit/KinitTool.java
+++ b/kerby-tool/client-tool/src/main/java/org/apache/kerby/kerberos/tool/kinit/KinitTool.java
@@ -21,6 +21,7 @@ package org.apache.kerby.kerberos.tool.kinit;
 
 import org.apache.kerby.KOption;
 import org.apache.kerby.KOptionGroup;
+import org.apache.kerby.KOptionInfo;
 import org.apache.kerby.KOptionType;
 import org.apache.kerby.KOptions;
 import org.apache.kerby.kerberos.kerb.KrbException;
@@ -254,20 +255,20 @@ public class KinitTool {
         KOptions results = new KOptions();
 
         for (KOption toolOpt : toolOptions.getOptions()) {
-            KinitOption kinitOption = (KinitOption) toolOpt;
-            KOptionGroup group = kinitOption.getOptionInfo().getGroup();
+            KOptionInfo kOptionInfo = toolOpt.getOptionInfo();
+            KOptionGroup group = kOptionInfo.getGroup();
             KOption kOpt = null;
 
             if (group == KrbOptionGroup.KRB) {
-                kOpt = KrbOption.fromOptionName(kinitOption.name());
+                kOpt = KrbOption.fromOptionName(kOptionInfo.getName());
             } else if (group == KrbOptionGroup.PKINIT) {
-                kOpt = PkinitOption.fromOptionName(kinitOption.name());
+                kOpt = PkinitOption.fromOptionName(kOptionInfo.getName());
             } else if (group == KrbOptionGroup.TOKEN) {
-                kOpt = TokenOption.fromOptionName(kinitOption.name());
+                kOpt = TokenOption.fromOptionName(kOptionInfo.getName());
             } else if (group == KrbOptionGroup.KDC_FLAGS) {
-                kOpt = KrbKdcOption.fromOptionName(kinitOption.name());
+                kOpt = KrbKdcOption.fromOptionName(kOptionInfo.getName());
             }
-            if (kOpt != null && kOpt != KrbOption.NONE) {
+            if (kOpt != null && kOpt.getOptionInfo() != KrbOption.NONE.getOptionInfo()) {
                 kOpt.getOptionInfo().setValue(toolOpt.getOptionInfo().getValue());
                 results.add(kOpt);
             }