You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by co...@apache.org on 2017/07/24 11:43:24 UTC
[2/2] directory-kerby git commit: Revert "DIRKRB-636 - NPE in
GssInitCred when a tgt is obtained via JAAS"
Revert "DIRKRB-636 - NPE in GssInitCred when a tgt is obtained via JAAS"
This reverts commit 158a6a1c294fe4904277aa592a677082aab0cf74.
Project: http://git-wip-us.apache.org/repos/asf/directory-kerby/repo
Commit: http://git-wip-us.apache.org/repos/asf/directory-kerby/commit/f8302431
Tree: http://git-wip-us.apache.org/repos/asf/directory-kerby/tree/f8302431
Diff: http://git-wip-us.apache.org/repos/asf/directory-kerby/diff/f8302431
Branch: refs/heads/1.0.x-fixes
Commit: f830243184ae638c63e2d84e245a8403253c6678
Parents: 4d29487
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Mon Jul 24 12:42:25 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Mon Jul 24 12:42:25 2017 +0100
----------------------------------------------------------------------
.../kerberos/kerb/integration/test/KerbyGssAppTest.java | 1 +
.../org/apache/kerby/kerberos/kerb/gss/impl/GssInitCred.java | 8 --------
2 files changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/f8302431/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/KerbyGssAppTest.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/KerbyGssAppTest.java b/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/KerbyGssAppTest.java
index 2e01975..ef5be9f 100644
--- a/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/KerbyGssAppTest.java
+++ b/kerby-kerb/integration-test/src/test/java/org/apache/kerby/kerberos/kerb/integration/test/KerbyGssAppTest.java
@@ -41,6 +41,7 @@ public class KerbyGssAppTest extends GssAppTest {
}
@Test
+ @org.junit.Ignore
public void testJAAS() throws Exception {
super.testJAAS();
}
http://git-wip-us.apache.org/repos/asf/directory-kerby/blob/f8302431/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssInitCred.java
----------------------------------------------------------------------
diff --git a/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssInitCred.java b/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssInitCred.java
index fd04251..0b2516d 100644
--- a/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssInitCred.java
+++ b/kerby-kerb/kerb-gssapi/src/main/java/org/apache/kerby/kerberos/kerb/gss/impl/GssInitCred.java
@@ -20,8 +20,6 @@
package org.apache.kerby.kerberos.kerb.gss.impl;
import org.ietf.jgss.GSSException;
-import org.ietf.jgss.GSSName;
-
import sun.security.jgss.GSSCaller;
import javax.security.auth.kerberos.KerberosTicket;
@@ -37,12 +35,6 @@ public final class GssInitCred extends GssCredElement {
}
public static GssInitCred getInstance(GSSCaller caller, GssNameElement name, int lifeTime) throws GSSException {
- if (name == null) {
- KerberosTicket ticket = CredUtils.getKerberosTicketFromContext(caller, null, null);
- GssNameElement clientName = GssNameElement.getInstance(ticket.getClient().getName(), GSSName.NT_USER_NAME);
- return new GssInitCred(caller, clientName, ticket, lifeTime);
- }
-
KerberosTicket ticket = CredUtils.getKerberosTicketFromContext(caller, name.getPrincipalName().getName(), null);
return new GssInitCred(caller, name, ticket, lifeTime);
}