File openfire-3.7.0-SSLConfig.patch of Package openfire

Index: src/java/org/jivesoftware/openfire/net/SSLConfig.java
===================================================================
--- src/java/org/jivesoftware/openfire/net/SSLConfig.java	(Revision 12178)
+++ src/java/org/jivesoftware/openfire/net/SSLConfig.java	(Arbeitskopie)
@@ -319,6 +319,13 @@
         try {
             keyStore = KeyStore.getInstance(storeType);
             keyStore.load(null, keypass.toCharArray());
+            
+            // Also generate the trustStore if necessary
+            if (s2sTrustStore == null) {
+            	s2sTrustStore = KeyStore.getInstance(storeType);
+                s2sTrustStore.load(null, s2sTrustpass.toCharArray());
+            }
+
         }
         catch (Exception e) {
             Log.error("Unable to initialize keystore: ", e);
@@ -332,8 +339,9 @@
     public static void saveStores() throws IOException {
         try {
             File keyStoreDirectory = new File(keyStoreLocation).getParentFile();
-            if (!keyStoreDirectory.exists())
-                keyStoreDirectory.mkdirs();
+            if (!keyStoreDirectory.exists()){
+    			keyStoreDirectory.mkdirs();
+    		}
             keyStore.store(new FileOutputStream(keyStoreLocation), keypass.toCharArray());
 
             if (s2sTrustStore != null) {