--- a/jdk/src/share/classes/sun/security/krb5/internal/KDCOptions.java Sat Oct 27 09:18:29 2012 +0100
+++ b/jdk/src/share/classes/sun/security/krb5/internal/KDCOptions.java Mon Oct 29 14:14:06 2012 +0800
@@ -244,25 +244,23 @@
Config config = Config.getInstance();
- /*
- * First see if the IBM hex format is being used.
- * If not, try the Sun's string (boolean) format.
- */
+ // If key not present, returns Integer.MIN_VALUE, which is
+ // almost all zero.
- int options =config.getDefaultIntValue("kdc_default_options",
- "libdefaults");
+ int options = config.getIntValue("libdefaults",
+ "kdc_default_options");
if ((options & RENEWABLE_OK) == RENEWABLE_OK) {
set(RENEWABLE_OK, true);
} else {
- if (config.getDefaultBooleanValue("renewable", "libdefaults")) {
+ if (config.getBooleanValue("libdefaults", "renewable")) {
set(RENEWABLE_OK, true);
}
}
if ((options & PROXIABLE) == PROXIABLE) {
set(PROXIABLE, true);
} else {
- if (config.getDefaultBooleanValue("proxiable", "libdefaults")) {
+ if (config.getBooleanValue("libdefaults", "proxiable")) {
set(PROXIABLE, true);
}
}
@@ -270,7 +268,7 @@
if ((options & FORWARDABLE) == FORWARDABLE) {
set(FORWARDABLE, true);
} else {
- if (config.getDefaultBooleanValue("forwardable", "libdefaults")) {
+ if (config.getBooleanValue("libdefaults", "forwardable")) {
set(FORWARDABLE, true);
}
}