Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id CF8D5200D2B for ; Wed, 18 Oct 2017 10:29:03 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id CDFA1160BF1; Wed, 18 Oct 2017 08:29:03 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 43F67160BED for ; Wed, 18 Oct 2017 10:29:03 +0200 (CEST) Received: (qmail 14536 invoked by uid 500); 18 Oct 2017 08:29:02 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 14234 invoked by uid 99); 18 Oct 2017 08:29:01 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 18 Oct 2017 08:29:01 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BCA00DFD8C; Wed, 18 Oct 2017 08:29:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: plusplusjiajia@apache.org To: commits@directory.apache.org Date: Wed, 18 Oct 2017 08:29:07 -0000 Message-Id: <5c9649fb5a8c448f9edb1417951281a4@git.apache.org> In-Reply-To: <10beb0fd2bcb4cc38332d56a5358e803@git.apache.org> References: <10beb0fd2bcb4cc38332d56a5358e803@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [9/9] directory-kerby git commit: Merge remote-tracking branch 'asf/trunk' into trunk archived-at: Wed, 18 Oct 2017 08:29:04 -0000 Merge remote-tracking branch 'asf/trunk' into trunk Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/19c903e4 Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/19c903e4 Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/19c903e4 Branch: refs/heads/trunk Commit: 19c903e4fb5e8d5ba12148d6d4210c25698ea4ab Parents: 8790af2 8ae0b35 Author: plusplusjiajia Authored: Wed Oct 18 16:29:14 2017 +0800 Committer: plusplusjiajia Committed: Wed Oct 18 16:29:14 2017 +0800 ---------------------------------------------------------------------- .../apache/kerby/xdr/XdrStructTypeInstance.java | 1 + .../kerb/client/request/KdcRequest.java | 10 +++---- .../kerby/kerberos/kerb/Krb5ParserTest.java | 2 +- .../kerby/kerberos/kerb/gss/GssMechFactory.java | 3 +- .../kerberos/kerb/gss/impl/GssEncryptor.java | 2 +- .../kerberos/kerb/server/LoginTestBase.java | 2 +- .../kerberos/provider/token/TokenTest.java | 30 ++++++++++---------- pom.xml | 16 +++++++++++ 8 files changed, 42 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/19c903e4/kerby-kerb/kerb-client/src/main/java/org/apache/kerby/kerberos/kerb/client/request/KdcRequest.java ----------------------------------------------------------------------