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/07/17 01:47:10 UTC
directory-kerby git commit: Enable using keytab in kinit tool.
Repository: directory-kerby
Updated Branches:
refs/heads/trunk 3b594c8fd -> c70d5c934
Enable using keytab in kinit tool.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/c70d5c93
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/c70d5c93
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/c70d5c93
Branch: refs/heads/trunk
Commit: c70d5c9346a105f267e42cb8b1f45a15bcf9dcb1
Parents: 3b594c8
Author: plusplusjiajia <ji...@intel.com>
Authored: Mon Jul 17 09:46:56 2017 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Mon Jul 17 09:46:56 2017 +0800
----------------------------------------------------------------------
.../java/org/apache/kerby/kerberos/kerb/client/KrbOption.java | 4 ++--
.../kerberos/kerb/client/impl/DefaultInternalKrbClient.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c70d5c93/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbOption.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbOption.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbOption.java
index f20c908..61e6cd4 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbOption.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/KrbOption.java
@@ -60,9 +60,9 @@ public enum KrbOption implements KOption {
USE_PASSWD(new KOptionInfo("using-password", "using password")),
USER_PASSWD(new KOptionInfo("user-passwd", "User plain password")),
- USE_KEYTAB(new KOptionInfo("use-keytab", "use keytab")),
+ USE_KEYTAB(new KOptionInfo("-k", "use keytab")),
USE_DFT_KEYTAB(new KOptionInfo("use-dft-keytab", "use default client keytab (with -k)")),
- KEYTAB_FILE(new KOptionInfo("keytab-file", "filename of keytab to use",
+ KEYTAB_FILE(new KOptionInfo("-t", "filename of keytab to use",
KOptionType.FILE)),
KRB5_CACHE(new KOptionInfo("krb5-cache", "K5 cache name",
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/c70d5c93/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/impl/DefaultInternalKrbClient.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/impl/DefaultInternalKrbClient.java b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/impl/DefaultInternalKrbClient.java
index d7a9f1d..e7ea499 100644
--- a/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/impl/DefaultInternalKrbClient.java
+++ b/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/impl/DefaultInternalKrbClient.java
@@ -90,7 +90,7 @@ public class DefaultInternalKrbClient extends AbstractInternalKrbClient {
if (first instanceof KrbException) {
throw (KrbException) first;
}
- throw new KrbException("Failed to create transport", first);
+ throw new KrbException("The request failed " + first.getMessage(), first);
}
} finally {
if (transport != null) {