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/07/01 02:56:16 UTC
[2/2] directory-kerby git commit: Merge remote-tracking branch
'upstream/master'
Merge remote-tracking branch 'upstream/master'
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/c0063663
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/c0063663
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/c0063663
Branch: refs/heads/master
Commit: c00636637a132ecbcf4bd151546fe1ada94b45dd
Parents: 45f7921 064c08d
Author: plusplusjiajia <ji...@intel.com>
Authored: Wed Jul 1 08:58:35 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Wed Jul 1 08:58:35 2015 +0800
----------------------------------------------------------------------
.../kerby/kerberos/kdc/GssInteropTestBase.java | 33 +--
kerby-kdc-test/src/test/resources/kerberos.jaas | 8 -
.../kerby/kerberos/kerb/server/KdcTestBase.java | 17 +-
.../kerberos/kerb/server/GssInteropTest.java | 30 +--
.../src/test/resources/kerberos.jaas | 8 -
.../kerby/kerberos/kerb/client/JaasKrbUtil.java | 219 +++++++++++++++++++
.../kerby/kerberos/kerb/client/Krb5Conf.java | 53 +++++
.../kerby/kerberos/kerb/server/Krb5Conf.java | 51 -----
.../kerberos/kerb/server/SimpleKdcServer.java | 1 +
9 files changed, 286 insertions(+), 134 deletions(-)
----------------------------------------------------------------------