Blame SOURCES/pr3575-rh1567204-system_cacerts_database_handling_no_longer_affect_jssecacerts.patch

95d809
# HG changeset patch
95d809
# User andrew
95d809
# Date 1525111445 -3600
95d809
#      Mon Apr 30 19:04:05 2018 +0100
95d809
# Node ID 388fc8da23044317c160678ffa8ff541c216a255
95d809
# Parent  556adf3a76aa81bf3918d7d46554dae7cc1d5c5c
95d809
PR3575: System cacerts database handling should not affect jssecacerts
95d809
95d809
diff --git openjdk.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
95d809
--- openjdk.orig/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
95d809
+++ openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
95d809
@@ -162,7 +162,7 @@
95d809
          * Try:
95d809
          *      javax.net.ssl.trustStore  (if this variable exists, stop)
95d809
          *      jssecacerts
95d809
-         *      cacerts
95d809
+         *      cacerts (system and local)
95d809
          *
95d809
          * If none exists, we use an empty keystore.
95d809
          */
95d809
@@ -174,14 +174,14 @@
95d809
                     storeFile = new File(storeFileName);
95d809
                     fis = getFileInputStream(storeFile);
95d809
                 } else {
95d809
-                    /* Check system cacerts DB first; /etc/pki/java/cacerts */
95d809
-                    storeFile = new File(sep + "etc" + sep + "pki" + sep
95d809
-                                         + "java" + sep + "cacerts");
95d809
+                    String javaHome = props.get("javaHome");
95d809
+                    storeFile = new File(javaHome + sep + "lib" + sep
95d809
+                                         + "security" + sep +
95d809
+                                         "jssecacerts");
95d809
                     if ((fis = getFileInputStream(storeFile)) == null) {
95d809
-                        String javaHome = props.get("javaHome");
95d809
-                        storeFile = new File(javaHome + sep + "lib" + sep
95d809
-                                             + "security" + sep +
95d809
-                                             "jssecacerts");
95d809
+                        /* Check system cacerts DB first; /etc/pki/java/cacerts */
95d809
+                        storeFile = new File(sep + "etc" + sep + "pki" + sep
95d809
+                                             + "java" + sep + "cacerts");
95d809
                         if ((fis = getFileInputStream(storeFile)) == null) {
95d809
                             storeFile = new File(javaHome + sep + "lib" + sep
95d809
                                                  + "security" + sep +