diff --git a/src/share/classes/sun/security/krb5/internal/KDCOptions.java b/src/share/classes/sun/security/krb5/internal/KDCOptions.java index b0d609d9a8e680c9582ee4a194470f0030936558..f154eeb1dc97e9c4c6c8fbe5943d477eca4a5447 100644 --- a/src/share/classes/sun/security/krb5/internal/KDCOptions.java +++ b/src/share/classes/sun/security/krb5/internal/KDCOptions.java @@ -120,9 +120,9 @@ import java.io.IOException; 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 @@ public class KDCOptions extends KerberosFlags { 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 @@ public class KDCOptions extends KerberosFlags { } } - if ((options & FORWARDABLE) == FORWARDABLE) { + if ((options & KDC_OPT_FORWARDABLE) == KDC_OPT_FORWARDABLE) { set(FORWARDABLE, true); } else { if (config.getBooleanValue("libdefaults", "forwardable")) { diff --git a/test/sun/security/krb5/config/KdcDefaultOptions.java b/test/sun/security/krb5/config/KdcDefaultOptions.java new file mode 100644 index 0000000000000000000000000000000000000000..fb920635e4e873fd0224c2052b5d975c6c441e6a --- /dev/null +++ b/test/sun/security/krb5/config/KdcDefaultOptions.java @@ -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()); + } + } +} diff --git a/test/sun/security/krb5/config/kdc_default_options.conf b/test/sun/security/krb5/config/kdc_default_options.conf new file mode 100644 index 0000000000000000000000000000000000000000..03482c823fd8129517eb53733b076be1dcb9f322 --- /dev/null +++ b/test/sun/security/krb5/config/kdc_default_options.conf @@ -0,0 +1,3 @@ +[libdefaults] +default_realm = EXAMPLE.COM +kdc_default_options = 0x50000010