changeset 2620:402ff3e81922

6972005: ConfPlusProp.java test failure when DNS has info for realm Reviewed-by: xuelei
author weijun
date Mon, 26 Jul 2010 17:21:51 +0800
parents 56217857ccd7
children db21b420d038
files test/sun/security/krb5/ConfPlusProp.java test/sun/security/krb5/confplusprop.conf test/sun/security/krb5/confplusprop2.conf
diffstat 3 files changed, 8 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/test/sun/security/krb5/ConfPlusProp.java	Sat Jul 24 22:59:41 2010 +0800
+++ b/test/sun/security/krb5/ConfPlusProp.java	Mon Jul 26 17:21:51 2010 +0800
@@ -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 @@
             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);
--- a/test/sun/security/krb5/confplusprop.conf	Sat Jul 24 22:59:41 2010 +0800
+++ b/test/sun/security/krb5/confplusprop.conf	Mon Jul 26 17:21:51 2010 +0800
@@ -1,6 +1,7 @@
 [libdefaults]
 default_realm = R1
 forwardable = well
+dns_lookup_realm = false
 
 [realms]
 R1 = {
--- a/test/sun/security/krb5/confplusprop2.conf	Sat Jul 24 22:59:41 2010 +0800
+++ b/test/sun/security/krb5/confplusprop2.conf	Mon Jul 26 17:21:51 2010 +0800
@@ -1,3 +1,6 @@
+[libdefaults]
+dns_lookup_realm = false
+
 [realms]
 R1 = {
    kdc = k12