diff --git a/test/sun/security/krb5/ConfPlusProp.java b/test/sun/security/krb5/ConfPlusProp.java index f6304a131b05468a9ebbc17116cbd2199ff62a8d..e29637b1b154289da5c0230daf482278b69cf8b6 100644 --- a/test/sun/security/krb5/ConfPlusProp.java +++ b/test/sun/security/krb5/ConfPlusProp.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -24,6 +24,7 @@ * @test * @bug 6857795 * @bug 6858589 + * @bug 6972005 * @summary krb5.conf ignored if system properties on realm and kdc are provided */ @@ -96,7 +97,8 @@ public class ConfPlusProp { System.setProperty("java.security.krb5.conf", "i-am-not-a file"); refresh(); - checkDefaultRealm(null); + // Default realm might come from DNS + //checkDefaultRealm(null); check("R1", null); check("R2", null); check("R3", null); diff --git a/test/sun/security/krb5/confplusprop.conf b/test/sun/security/krb5/confplusprop.conf index 80c925b14cd9ecce85d656c02256cd7c07b47e12..5e499483348585e2b6bffee0ffc0f19c5a38f65c 100644 --- a/test/sun/security/krb5/confplusprop.conf +++ b/test/sun/security/krb5/confplusprop.conf @@ -1,6 +1,7 @@ [libdefaults] default_realm = R1 forwardable = well +dns_lookup_realm = false [realms] R1 = { diff --git a/test/sun/security/krb5/confplusprop2.conf b/test/sun/security/krb5/confplusprop2.conf index df00eccbccfdafa995b21634bb43e2738d26ca08..c55464bd8462e751eea9b812b3fca0dc745faaa7 100644 --- a/test/sun/security/krb5/confplusprop2.conf +++ b/test/sun/security/krb5/confplusprop2.conf @@ -1,3 +1,6 @@ +[libdefaults] +dns_lookup_realm = false + [realms] R1 = { kdc = k12