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/11/25 02:50:07 UTC
[2/4] directory-kerby git commit: Merge remote-tracking branch
'asf/master'
Merge remote-tracking branch 'asf/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/1fbaebc4
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/1fbaebc4
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/1fbaebc4
Branch: refs/heads/pkinit-support
Commit: 1fbaebc4a925ca14fc1ce541191c95d11d1e300a
Parents: 4865679 4bc0369
Author: plusplusjiajia <ji...@intel.com>
Authored: Tue Nov 24 17:57:56 2015 +0800
Committer: plusplusjiajia <ji...@intel.com>
Committed: Tue Nov 24 17:57:56 2015 +0800
----------------------------------------------------------------------
.../kerby/kerberos/kerb/client/KrbConfig.java | 10 ++--
.../kerby/kerberos/kerb/client/KrbSetting.java | 4 +-
.../kerb/client/request/ArmoredRequest.java | 29 ++++++++---
.../kerberos/kerb/client/request/AsRequest.java | 2 +-
.../kerb/client/request/KdcRequest.java | 23 ++++-----
.../kerb/client/request/TgsRequest.java | 2 +-
.../kerb/client/request/TgsRequestWithTgt.java | 35 ++++++++++----
.../kerb/client/KrbClientSettingTest.java | 28 ++++++++---
.../client/TestKrbConfigLoadForSpecials.java | 51 ++++++++++++++++++++
.../TestKrbConfigLoadWithDefaultRealm.java | 45 -----------------
.../src/test/resources/krb5-kdcrealm.conf | 19 --------
.../src/test/resources/krb5-specials.conf | 20 ++++++++
.../kerberos/kerb/common/CheckSumUtil.java | 21 +++++++-
.../kerby/kerberos/kerb/common/KrbUtil.java | 3 +-
.../kerberos/kerb/crypto/EncryptionHandler.java | 4 +-
.../kerby/kerberos/kerb/server/KdcConfig.java | 6 ++-
.../kerb/server/request/TgsRequest.java | 1 +
.../kerby/kerberos/tool/kinit/KinitTool.java | 11 +++--
18 files changed, 198 insertions(+), 116 deletions(-)
----------------------------------------------------------------------