changeset 6567:cb70077c6370

7195426: kdc_default_options not supported correctly Reviewed-by: xuelei
author weijun
date Mon, 29 Oct 2012 14:14:07 +0800
parents 33e29fbc3e5b
children d1ffbdf7e3c6
files src/share/classes/sun/security/krb5/internal/KDCOptions.java test/sun/security/krb5/config/KdcDefaultOptions.java test/sun/security/krb5/config/kdc_default_options.conf
diffstat 3 files changed, 55 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/share/classes/sun/security/krb5/internal/KDCOptions.java	Mon Oct 29 14:14:06 2012 +0800
+++ b/src/share/classes/sun/security/krb5/internal/KDCOptions.java	Mon Oct 29 14:14:07 2012 +0800
@@ -120,9 +120,9 @@
 
 public class KDCOptions extends KerberosFlags {
 
-    public final int KDC_OPT_PROXIABLE = 0x10000000;
-    public final int KDC_OPT_RENEWABLE_OK = 0x00000010;
-    public final int KDC_OPT_FORWARDABLE = 0x40000000;
+    private static final int KDC_OPT_PROXIABLE = 0x10000000;
+    private static final int KDC_OPT_RENEWABLE_OK = 0x00000010;
+    private static final int KDC_OPT_FORWARDABLE = 0x40000000;
 
 
     // KDC Options
@@ -250,14 +250,14 @@
             int options = config.getIntValue("libdefaults",
                     "kdc_default_options");
 
-            if ((options & RENEWABLE_OK) == RENEWABLE_OK) {
+            if ((options & KDC_OPT_RENEWABLE_OK) == KDC_OPT_RENEWABLE_OK) {
                 set(RENEWABLE_OK, true);
             } else {
                 if (config.getBooleanValue("libdefaults", "renewable")) {
                     set(RENEWABLE_OK, true);
                 }
             }
-            if ((options & PROXIABLE) == PROXIABLE) {
+            if ((options & KDC_OPT_PROXIABLE) == KDC_OPT_PROXIABLE) {
                 set(PROXIABLE, true);
             } else {
                 if (config.getBooleanValue("libdefaults", "proxiable")) {
@@ -265,7 +265,7 @@
                 }
             }
 
-            if ((options & FORWARDABLE) == FORWARDABLE) {
+            if ((options & KDC_OPT_FORWARDABLE) == KDC_OPT_FORWARDABLE) {
                 set(FORWARDABLE, true);
             } else {
                 if (config.getBooleanValue("libdefaults", "forwardable")) {
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/sun/security/krb5/config/KdcDefaultOptions.java	Mon Oct 29 14:14:07 2012 +0800
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2012, 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
+ * 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 Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+/*
+ * @test
+ * @bug 7195426
+ * @summary kdc_default_options not supported correctly
+ * @compile -XDignore.symbol.file KdcDefaultOptions.java
+ * @run main/othervm KdcDefaultOptions
+ */
+
+import sun.security.krb5.Config;
+import sun.security.krb5.internal.KDCOptions;
+
+public class KdcDefaultOptions {
+    public static void main(String[] args) throws Exception {
+        System.setProperty("java.security.krb5.conf",
+                System.getProperty("test.src", ".") + "/kdc_default_options.conf");
+        Config.refresh();
+        KDCOptions options = new KDCOptions();
+        if (!options.get(KDCOptions.FORWARDABLE) ||
+                !options.get(KDCOptions.PROXIABLE) ||
+                !options.get(KDCOptions.RENEWABLE_OK)) {
+            throw new Exception(options.toString());
+        }
+    }
+}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/sun/security/krb5/config/kdc_default_options.conf	Mon Oct 29 14:14:07 2012 +0800
@@ -0,0 +1,3 @@
+[libdefaults]
+default_realm = EXAMPLE.COM
+kdc_default_options = 0x50000010