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 BF030200CD2 for ; Thu, 27 Jul 2017 11:07:23 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id BD7F816A8F5; Thu, 27 Jul 2017 09:07:23 +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 0F05916A8F2 for ; Thu, 27 Jul 2017 11:07:22 +0200 (CEST) Received: (qmail 97066 invoked by uid 500); 27 Jul 2017 09:07:22 -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 97057 invoked by uid 99); 27 Jul 2017 09:07:21 -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; Thu, 27 Jul 2017 09:07:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A92BCE360F; Thu, 27 Jul 2017 09:07:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: coheigea@apache.org To: commits@directory.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: directory-kerby git commit: NPE fix if no keytab is found and we have no principal name Date: Thu, 27 Jul 2017 09:07:19 +0000 (UTC) archived-at: Thu, 27 Jul 2017 09:07:23 -0000 Repository: directory-kerby Updated Branches: refs/heads/trunk db14ad6b2 -> b5033d994 NPE fix if no keytab is found and we have no principal name Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/b5033d99 Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/b5033d99 Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/b5033d99 Branch: refs/heads/trunk Commit: b5033d9941b9796dd9b4f8ea5fc600577c4358cd Parents: db14ad6 Author: Colm O hEigeartaigh Authored: Thu Jul 27 10:07:03 2017 +0100 Committer: Colm O hEigeartaigh Committed: Thu Jul 27 10:07:03 2017 +0100 ---------------------------------------------------------------------- .../apache/kerby/kerberos/kerb/gss/impl/GssAcceptCred.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/b5033d99/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssAcceptCred.java ---------------------------------------------------------------------- diff --git a/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssAcceptCred.java b/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssAcceptCred.java index 120f9de..e33a4f3 100644 --- a/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssAcceptCred.java +++ b/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssAcceptCred.java @@ -46,8 +46,11 @@ public final class GssAcceptCred extends GssCredElement { } if (keyTab == null) { - throw new GSSException(GSSException.NO_CRED, -1, - "Failed to find any Kerberos credential for " + name.getPrincipalName().getName()); + String error = "Failed to find any Kerberos credential"; + if (name != null) { + error += " for " + name.getPrincipalName().getName(); + } + throw new GSSException(GSSException.NO_CRED, -1, error); } if (name == null) {