Updates to provide better ConfigParser error reporting in exceptions, and

    also additional functionality in Instance.cpp, SystemInternal.h and
    SystemOpenSSL.* to support configuration in the Instance constructor.
    The latter is commented out because it currently breaks the IceSSL
    tests. Will fix tomorrow.

1 files changed, 23 insertions, 0 deletions

diff --git a/cpp/src/Ice/SystemOpenSSL.cpp b/cpp/src/Ice/SystemOpenSSL.cpp
index f14dc4f8981..28e169d5d2d 100644
--- a/cpp/src/Ice/SystemOpenSSL.cpp
+++ b/cpp/src/Ice/SystemOpenSSL.cpp
@@ -114,6 +114,29 @@ IceSSL::OpenSSL::System::isConfigured(ContextType contextType)
 }
 
 void
+IceSSL::OpenSSL::System::configure()
+{
+    string clientConfigFile = _properties->getProperty("Ice.SSL.Client.Config");
+    string serverConfigFile = _properties->getProperty("Ice.SSL.Server.Config");
+    
+    bool clientConfig = (clientConfigFile.empty() ? false : true);
+    bool serverConfig = (serverConfigFile.empty() ? false : true);
+
+    if (clientConfig && serverConfig)
+    {
+        configure(ClientServer);
+    }
+    else if (clientConfig)
+    {
+        configure(Client);
+    }
+    else if (serverConfig)
+    {
+        configure(Server);
+    }
+}
+
+void
 IceSSL::OpenSSL::System::configure(ContextType contextType)
 {
     IceUtil::RecMutex::Lock sync(_configMutex);