You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ya...@apache.org on 2015/11/03 13:36:47 UTC
[1/2] directory-kerby git commit: wip
Repository: directory-kerby
Updated Branches:
refs/heads/master 6006704d8 -> ed6869936
wip
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/81232465
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/81232465
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/81232465
Branch: refs/heads/master
Commit: 812324651da8759b9d2959ce5679ff9b2dc887b3
Parents: 6006704
Author: yaningxu <ya...@gmail.com>
Authored: Tue Nov 3 16:50:42 2015 +0800
Committer: yaningxu <ya...@gmail.com>
Committed: Tue Nov 3 16:50:42 2015 +0800
----------------------------------------------------------------------
.../org/apache/kerby/kerberos/tool/kinit/KinitTool.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/81232465/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 0a4ed6d..7760f34 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
@@ -24,6 +24,7 @@ import org.apache.kerby.KOptions;
import org.apache.kerby.kerberos.kerb.KrbException;
import org.apache.kerby.kerberos.kerb.client.KrbClient;
import org.apache.kerby.kerberos.kerb.client.KrbOption;
+import org.apache.kerby.kerberos.kerb.spec.ticket.ServiceTicket;
import org.apache.kerby.kerberos.kerb.spec.ticket.TgtTicket;
import org.apache.kerby.kerberos.tool.ToolUtil;
import org.apache.kerby.util.OSUtil;
@@ -103,7 +104,7 @@ public class KinitTool {
}
private static void requestTicket(String principal,
- KOptions ktOptions) {
+ KOptions ktOptions) throws KrbException {
ktOptions.add(KinitOption.CLIENT_PRINCIPAL, principal);
File confDir = null;
@@ -153,6 +154,13 @@ public class KinitTool {
System.err.println("Store ticket failed: " + e.getMessage());
System.exit(1);
}
+
+ if (ktOptions.contains(KinitOption.SERVICE)) {
+ String servicePrincipal = ktOptions.getStringOption(KinitOption.SERVICE);
+ ServiceTicket serviceTicket =
+ krbClient.requestServiceTicketWithTgt(tgt, servicePrincipal);
+ System.out.println(serviceTicket.toString());
+ }
System.out.println("Successfully requested and stored ticket in "
+ ccacheFile.getAbsolutePath());
}
[2/2] directory-kerby git commit: kinit is enhanced to request a
service ticket
Posted by ya...@apache.org.
kinit is enhanced to request a service ticket
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/ed686993
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/ed686993
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/ed686993
Branch: refs/heads/master
Commit: ed68699363ac6608af0a956ff95702aa88dd68ed
Parents: 8123246
Author: yaningxu <ya...@gmail.com>
Authored: Tue Nov 3 20:32:23 2015 +0800
Committer: yaningxu <ya...@gmail.com>
Committed: Tue Nov 3 20:32:23 2015 +0800
----------------------------------------------------------------------
.../java/org/apache/kerby/kerberos/tool/kinit/KinitTool.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/ed686993/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 7760f34..8c06b9e 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
@@ -155,14 +155,15 @@ public class KinitTool {
System.exit(1);
}
+ System.out.println("Successfully requested and stored ticket in "
+ + ccacheFile.getAbsolutePath());
if (ktOptions.contains(KinitOption.SERVICE)) {
String servicePrincipal = ktOptions.getStringOption(KinitOption.SERVICE);
ServiceTicket serviceTicket =
krbClient.requestServiceTicketWithTgt(tgt, servicePrincipal);
- System.out.println(serviceTicket.toString());
+ System.out.println("Successfully requested the service ticket for " + servicePrincipal
+ + "\nKey version: " + serviceTicket.getTicket().getTktvno());
}
- System.out.println("Successfully requested and stored ticket in "
- + ccacheFile.getAbsolutePath());
}
/**