changeset 10835:db0bbb6a4599

Update references to krb5.conf from lib to conf
author chegar
date Fri, 17 Oct 2014 11:35:40 +0100
parents 1ff8212ca453
children 2567991fddc2
files src/java.security.jgss/share/classes/javax/security/auth/kerberos/package-info.java src/java.security.jgss/share/classes/sun/security/krb5/Config.java
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/java.security.jgss/share/classes/javax/security/auth/kerberos/package-info.java	Fri Oct 17 10:42:35 2014 +0100
+++ b/src/java.security.jgss/share/classes/javax/security/auth/kerberos/package-info.java	Fri Oct 17 11:35:40 2014 +0100
@@ -45,7 +45,7 @@
  * file. If none of these system properties are set, the {@code krb5.conf}
  * file is searched for in an implementation-specific manner. Typically,
  * an implementation will first look for a {@code krb5.conf} file in
- * {@code <java-home>/lib/security} and failing that, in an OS-specific
+ * {@code <java-home>/conf/security} and failing that, in an OS-specific
  * location.<p>
  *
  * The {@code krb5.conf} file is formatted in the Windows INI file style,
--- a/src/java.security.jgss/share/classes/sun/security/krb5/Config.java	Fri Oct 17 10:42:35 2014 +0100
+++ b/src/java.security.jgss/share/classes/sun/security/krb5/Config.java	Fri Oct 17 11:35:40 2014 +0100
@@ -737,7 +737,7 @@
      *
      * If the system property "java.security.krb5.conf" is defined, we'll
      * use its value, no matter if the file exists or not. Otherwise, we
-     * will look at $JAVA_HOME/lib/security directory with "krb5.conf" name,
+     * will look at $JAVA_HOME/conf/security directory with "krb5.conf" name,
      * and return it if the file exists.
      *
      * The method returns null if it cannot find a Java config file.
@@ -746,7 +746,7 @@
         String name = getProperty("java.security.krb5.conf");
         if (name == null) {
             name = getProperty("java.home") + File.separator +
-                                "lib" + File.separator + "security" +
+                                "conf" + File.separator + "security" +
                                 File.separator + "krb5.conf";
             if (!fileExists(name)) {
                 name = null;