You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by dr...@apache.org on 2015/11/21 03:50:14 UTC
directory-kerby git commit: DIRKRB-466 [KinitTool] conf option should
be optional as it is specified
Repository: directory-kerby
Updated Branches:
refs/heads/master f7cff5922 -> 63d7ff1a8
DIRKRB-466 [KinitTool] conf option should be optional as it is specified
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/63d7ff1a
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/63d7ff1a
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/63d7ff1a
Branch: refs/heads/master
Commit: 63d7ff1a843cd9a0c99e226ca24fd91b68e2923a
Parents: f7cff59
Author: Drankye <dr...@gmail.com>
Authored: Sun Nov 22 10:50:02 2015 +0800
Committer: Drankye <dr...@gmail.com>
Committed: Sun Nov 22 10:50:02 2015 +0800
----------------------------------------------------------------------
.../org/apache/kerby/kerberos/tool/kinit/KinitTool.java | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/63d7ff1a/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 8c06b9e..a7329c4 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
@@ -110,8 +110,6 @@ public class KinitTool {
File confDir = null;
if (ktOptions.contains(KinitOption.CONF_DIR)) {
confDir = ktOptions.getDirOption(KinitOption.CONF_DIR);
- } else {
- printUsage("Can't get the conf dir!");
}
//If not request tickets by keytab than by password.
@@ -170,7 +168,14 @@ public class KinitTool {
* Init the client.
*/
private static KrbClient getClient(File confDir) throws KrbException {
- KrbClient krbClient = new KrbClient(confDir);
+ KrbClient krbClient;
+
+ if (confDir != null) {
+ krbClient = new KrbClient(confDir);
+ } else {
+ krbClient = new KrbClient();
+ }
+
krbClient.init();
return krbClient;
}