changeset 70:f6f456d2fabf

6673164: dns_fallback parse error Reviewed-by: valeriep
author weijun
date Wed, 12 Mar 2008 09:32:38 +0800
parents 06eb4d224a6b
children a43ebfd8915a
files src/share/classes/sun/security/krb5/Config.java test/sun/security/krb5/DnsFallback.java
diffstat 2 files changed, 69 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/sun/security/krb5/Config.java	Sat Mar 08 22:52:20 2008 +0800
+++ b/src/share/classes/sun/security/krb5/Config.java	Wed Mar 12 09:32:38 2008 +0800
@@ -1040,11 +1040,12 @@
      * Check if need to use DNS to locate Kerberos services
      */
     public boolean useDNS(String name) {
-        boolean value = getDefaultBooleanValue(name, "libdefaults");
-        if (value == false) {
-            value = getDefaultBooleanValue("dns_fallback", "libdefaults");
+        String value = getDefault(name, "libdefaults");
+        if (value == null) {
+            return getDefaultBooleanValue("dns_fallback", "libdefaults");
+        } else {
+            return value.equalsIgnoreCase("true");
         }
-        return value;
     }
 
     /**
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/sun/security/krb5/DnsFallback.java	Wed Mar 12 09:32:38 2008 +0800
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2008 Sun Microsystems, Inc.  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
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+ * CA 95054 USA or visit www.sun.com if you need additional information or
+ * have any questions.
+ */
+/*
+ * @test
+ * @bug 6673164
+ * @summary dns_fallback parse error
+ */
+
+import sun.security.krb5.*;
+import java.io.*;
+
+public class DnsFallback {
+    public static void main(String[] args) throws Exception {
+        check("true", "true", true);
+        check("false", "true", false);
+        check("true", "false", true);
+        check("false", "false", false);
+        check("true", null, true);
+        check("false", null, false);
+        check(null, "true", true);
+        check(null, "false", false);
+    }
+
+    static void check(String realm, String fallback, boolean output) throws Exception {
+        FileOutputStream fo = new FileOutputStream("dnsfallback.conf");
+        StringBuffer sb = new StringBuffer();
+        sb.append("[libdefaults]\n");
+        if (realm != null) {
+            sb.append("dns_lookup_realm=" + realm + "\n");
+        }
+        if (fallback != null) {
+            sb.append("dns_fallback=" + fallback + "\n");
+        }
+        fo.write(sb.toString().getBytes());
+        fo.close();
+        System.setProperty("java.security.krb5.conf", "dnsfallback.conf");
+        Config.refresh();
+        System.out.println("Testing " + realm + ", " + fallback + ", " + output);
+        if (Config.getInstance().useDNS_Realm() != output) {
+            throw new Exception("Fail");
+        }
+    }
+}
+