You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ha...@apache.org on 2015/04/01 12:53:44 UTC
[1/2] directory-kerby git commit: FIx some bugs about playing with
the standalone kdc server.
Repository: directory-kerby
Updated Branches:
refs/heads/master c850f65b2 -> b5dfba1a2
FIx some bugs about playing with the standalone kdc server.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/b8d9a17a
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/b8d9a17a
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/b8d9a17a
Branch: refs/heads/master
Commit: b8d9a17a4d5ffca8cf820a62638625d970016f10
Parents: 6a437e9
Author: Lin Chen <li...@foxmail.com>
Authored: Wed Apr 1 18:35:24 2015 +0800
Committer: Lin Chen <li...@foxmail.com>
Committed: Wed Apr 1 18:35:24 2015 +0800
----------------------------------------------------------------------
.../main/java/org/apache/kerby/kerberos/kdc/KerbyKdcServer.java | 2 +-
.../src/main/java/org/apache/kerby/kerberos/tool/kinit/Kinit.java | 3 +++
.../java/org/apache/kerby/kerberos/tool/kinit/KinitOption.java | 1 +
3 files changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/b8d9a17a/kerby-kdc/src/main/java/org/apache/kerby/kerberos/kdc/KerbyKdcServer.java
----------------------------------------------------------------------
diff --git a/kerby-kdc/src/main/java/org/apache/kerby/kerberos/kdc/KerbyKdcServer.java b/kerby-kdc/src/main/java/org/apache/kerby/kerberos/kdc/KerbyKdcServer.java
index f0d014b..051b0b3 100644
--- a/kerby-kdc/src/main/java/org/apache/kerby/kerberos/kdc/KerbyKdcServer.java
+++ b/kerby-kdc/src/main/java/org/apache/kerby/kerberos/kdc/KerbyKdcServer.java
@@ -81,7 +81,7 @@ public class KerbyKdcServer extends KdcServer {
* If no, add it to identity backend.
*/
private void createTgtPrincipal() {
- String tgtPrincipal = "krbtgt";
+ String tgtPrincipal = fixPrincipal("krbtgt");
KrbIdentity tgtIdentity = getIdentityService().getIdentity(tgtPrincipal);
if (tgtIdentity == null) {
createPrincipals(tgtPrincipal);
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/b8d9a17a/kerby-tool/client-tool/src/main/java/org/apache/kerby/kerberos/tool/kinit/Kinit.java
----------------------------------------------------------------------
diff --git a/kerby-tool/client-tool/src/main/java/org/apache/kerby/kerberos/tool/kinit/Kinit.java b/kerby-tool/client-tool/src/main/java/org/apache/kerby/kerberos/tool/kinit/Kinit.java
index 7c16c98..6c47ee9 100644
--- a/kerby-tool/client-tool/src/main/java/org/apache/kerby/kerberos/tool/kinit/Kinit.java
+++ b/kerby-tool/client-tool/src/main/java/org/apache/kerby/kerberos/tool/kinit/Kinit.java
@@ -104,7 +104,10 @@ public class Kinit {
private static void requestTicket(String principal,
KOptions ktOptions) throws Exception {
ktOptions.add(KinitOption.CLIENT_PRINCIPAL, principal);
+
+ //If not request tickets by keytab than by password.
if (! ktOptions.contains(KinitOption.USE_KEYTAB)) {
+ ktOptions.add(KinitOption.USE_PASSWD);
String password = getPassword(principal);
ktOptions.add(KinitOption.USER_PASSWD, password);
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/b8d9a17a/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 bce997b..6ba8606 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
@@ -39,6 +39,7 @@ public enum KinitOption implements KOption {
RENEW("-R", "renew"),
CANONICALIZE("-C", "canonicalize"),
AS_ENTERPRISE_PN("-E", "client is enterprise principal name"),
+ USE_PASSWD("using password", "using password"),
USER_PASSWD("user-passwd", "User plain password"),
USE_KEYTAB("-k", "use keytab"),
USE_DFT_KEYTAB("-i", "use default client keytab (with -k)"),
[2/2] directory-kerby git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/directory-kerby
Posted by ha...@apache.org.
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/directory-kerby
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/b5dfba1a
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/b5dfba1a
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/b5dfba1a
Branch: refs/heads/master
Commit: b5dfba1a230caa40c96ea3701f9bca134ea18c96
Parents: b8d9a17 c850f65
Author: Lin Chen <li...@foxmail.com>
Authored: Wed Apr 1 18:52:13 2015 +0800
Committer: Lin Chen <li...@foxmail.com>
Committed: Wed Apr 1 18:52:13 2015 +0800
----------------------------------------------------------------------
.../kerby/kerberos/kerb/ccache/ccache.txt | 98 -----------------
.../kerby/kerberos/kerb/keytab/keytab.txt | 106 -------------------
.../kerb-util/src/main/resources/ccache.txt | 98 +++++++++++++++++
.../kerb-util/src/main/resources/keytab.txt | 106 +++++++++++++++++++
4 files changed, 204 insertions(+), 204 deletions(-)
----------------------------------------------------------------------