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/09/09 03:36:56 UTC

[35/46] directory-kerby git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/directory-kerby

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/a4825f0d
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/a4825f0d
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/a4825f0d

Branch: refs/heads/pkinit-support
Commit: a4825f0d716bf48bbb407fb2e2a93f3c6eaffaa0
Parents: 954dd26 61e0f0f
Author: yaningxu <ya...@gmail.com>
Authored: Tue Aug 25 09:06:57 2015 +0800
Committer: yaningxu <ya...@gmail.com>
Committed: Tue Aug 25 09:06:57 2015 +0800

----------------------------------------------------------------------
 .../org/apache/kerby/asn1/Asn1InputBuffer.java  |  2 +-
 .../identitybackend/LdapIdentityGetHelper.java  | 20 ++++++-------
 .../java/org/apache/kerby/MavibotBackend.java   |  2 +-
 .../identitybackend/IdentityZNodeHelper.java    |  2 +-
 .../kerberos/kdc/identitybackend/ZKUtil.java    | 24 ++++++++++-----
 .../integration/test/jaas/TokenJaasKrbUtil.java |  4 +--
 .../kerby/kerberos/kerb/client/KrbClient.java   |  3 +-
 .../kerby/kerberos/kerb/client/KrbConfig.java   | 31 +++++++++++++++++---
 .../kerby/kerberos/kerb/client/KrbContext.java  |  6 ++++
 .../kerb/client/impl/InternalKrbClient.java     |  9 +++---
 .../kerb/client/preauth/PreauthHandler.java     |  2 ++
 .../kerberos/kerb/transport/KrbTransport.java   |  1 +
 .../apache/kerby/kerberos/kerb/KrbRuntime.java  |  2 ++
 .../kerby/kerberos/kerb/provider/PkiLoader.java | 24 +++++++--------
 .../kerberos/kerb/provider/TokenDecoder.java    |  6 ++--
 .../kerberos/kerb/provider/TokenEncoder.java    |  6 ++--
 .../kerby/kerberos/kerb/spec/KerberosTime.java  | 15 ++++++++--
 .../kerberos/kerb/spec/base/AuthToken.java      | 16 +++++-----
 .../kerby/kerberos/kerb/spec/base/KrbToken.java |  6 ++++
 .../kerb/identity/backend/BackendTestBase.java  |  1 +
 .../backend/AbstractIdentityBackend.java        |  2 ++
 .../kerberos/kerb/server/SimpleKdcServer.java   | 13 ++++----
 .../provider/token/JwtTokenDecoder.java         |  4 +--
 .../main/java/org/apache/kerby/util/IOUtil.java |  6 ++--
 24 files changed, 137 insertions(+), 70 deletions(-)
----------------------------------------------------------------------