Updated config files to conform to pathnames. Modified error message

    generation in SslConfigErrorReporter.cpp in an effort to fix mangled
    error messages - still needs work.

5 files changed, 27 insertions, 25 deletions

diff --git a/cpp/demo/Ice/callback/config b/cpp/demo/Ice/callback/config
index 97b15732724..815a5e2caed 100644
--- a/cpp/demo/Ice/callback/config
+++ b/cpp/demo/Ice/callback/config
@@ -5,7 +5,7 @@ Ice.Trace.Network=3
 #Ice.Trace.Protocol=1
 #Ice.ConnectionWarnings=1
 
-Ice.Security.Ssl.CertPath=../../../Certs
+Ice.Security.Ssl.CertPath=../../../certs
 Ice.Security.Ssl.Config=sslconfig.xml
 
 #Glacier.Router.Endpoints=default -p 10005
diff --git a/cpp/demo/Ice/callback/config.server b/cpp/demo/Ice/callback/config.server
index 9d0c73b1f08..baf7163a086 100644
--- a/cpp/demo/Ice/callback/config.server
+++ b/cpp/demo/Ice/callback/config.server
@@ -4,5 +4,5 @@ Ice.Trace.Network=3
 #Ice.Trace.Protocol=1

 #Ice.ConnectionWarnings=1

 

-Ice.Security.Ssl.CertPath=../../../Certs

+Ice.Security.Ssl.CertPath=../../../certs

 Ice.Security.Ssl.Config=sslconfig.xml

diff --git a/cpp/demo/Ice/nested/config b/cpp/demo/Ice/nested/config
index 242139a7974..4bbcf40800b 100644
--- a/cpp/demo/Ice/nested/config
+++ b/cpp/demo/Ice/nested/config
@@ -1,12 +1,13 @@
-Nested.NestedServer=nestedServer:default -p 10000 -t 10000
-Ice.Adapter.NestedClientAdapter.Endpoints=default -t 10000
+Nested.NestedServer=nestedServer:ssl -p 10000 -t 10000
+Ice.Adapter.NestedClientAdapter.Endpoints=ssl -t 10000
 
 Ice.ThreadPool.Size=50
+Ice.Trace.Security=6
 #Ice.Trace.Network=1
 #Ice.Trace.Protocol=1
 #Ice.ConnectionWarnings=1
 
-Ice.Security.Ssl.CertPath=../../../Certs
+Ice.Security.Ssl.CertPath=../../../certs
 Ice.Security.Ssl.Config=sslconfig.xml
 
 #Glacier.Router.Endpoints=default -p 10005
diff --git a/cpp/demo/Ice/nested/config.server b/cpp/demo/Ice/nested/config.server
index 63ce6080b9a..d8850ff3fad 100644
--- a/cpp/demo/Ice/nested/config.server
+++ b/cpp/demo/Ice/nested/config.server
@@ -1,9 +1,10 @@
-Ice.Adapter.NestedServerAdapter.Endpoints=default -p 10000 -t 10000

+Ice.Adapter.NestedServerAdapter.Endpoints=ssl -p 10000 -t 10000

 

 Ice.ThreadPool.Size=50

+Ice.Trace.Security=6

 #Ice.Trace.Network=1

 #Ice.Trace.Protocol=1

 #Ice.ConnectionWarnings=1

 

-Ice.Security.Ssl.CertPath=../../../Certs

+Ice.Security.Ssl.CertPath=../../../certs

 Ice.Security.Ssl.Config=sslconfig.xml

diff --git a/cpp/src/Ice/SslConfigErrorReporter.cpp b/cpp/src/Ice/SslConfigErrorReporter.cpp
index 62763da2848..32bf7022d68 100644
--- a/cpp/src/Ice/SslConfigErrorReporter.cpp
+++ b/cpp/src/Ice/SslConfigErrorReporter.cpp
@@ -28,12 +28,12 @@ IceSecurity::Ssl::ErrorReporter::warning(const SAXParseException& toCatch)
     {
 	ostringstream s;
 
-        s << "SSL configuration file parse warning.\n"
-          << "Xerces-c Init Exception: "<< "Warning at file \""
-          << DOMString(toCatch.getSystemId())
-          << "\", line " << toCatch.getLineNumber()
-          << ", column " << toCatch.getColumnNumber()
-          << "\n   Message: " << DOMString(toCatch.getMessage()) << endl;
+        s << "SSL configuration file parse warning.\n" << flush;
+        s << "Xerces-c Init Exception: Warning at file \"" << flush;
+        s << DOMString(toCatch.getSystemId()) << flush;
+        s << "\", line " << toCatch.getLineNumber() << flush;
+        s << ", column " << toCatch.getColumnNumber() << flush;
+        s << "\n   Message: " << DOMString(toCatch.getMessage()) << endl;
 
         ICE_PARSE_WARNING(s.str());
     }
@@ -48,12 +48,12 @@ IceSecurity::Ssl::ErrorReporter::error(const SAXParseException& toCatch)
     {
 	ostringstream s;
 
-        s << "SSL configuration file parse error.\n"
-          << "Xerces-c Init Exception: "<< "Error at file \""
-          << DOMString(toCatch.getSystemId())
-          << "\", line " << toCatch.getLineNumber()
-          << ", column " << toCatch.getColumnNumber()
-          << "\n   Message: " << DOMString(toCatch.getMessage()) << endl;
+        s << "SSL configuration file parse error.\n" << flush;
+        s << "Xerces-c Init Exception: Error at file \"" << flush;
+        s << DOMString(toCatch.getSystemId()) << flush;
+        s << "\", line " << toCatch.getLineNumber() << flush;
+        s << ", column " << toCatch.getColumnNumber() << flush;
+        s << "\n   Message: " << DOMString(toCatch.getMessage()) << endl;
 
         ICE_PARSE_WARNING(s.str());
     }
@@ -68,12 +68,12 @@ IceSecurity::Ssl::ErrorReporter::fatalError(const SAXParseException& toCatch)
     {
 	ostringstream s;
 
-        s << "SSL configuration file parse error.\n"
-          << "Xerces-c Init Exception: "<< "Fatal error at file \""
-          << DOMString(toCatch.getSystemId())
-          << "\", line " << toCatch.getLineNumber()
-          << ", column " << toCatch.getColumnNumber()
-          << "\n   Message: " << DOMString(toCatch.getMessage()) << endl;
+        s << "SSL configuration file parse error.\n" << flush;
+        s << "Xerces-c Init Exception: Fatal error at file \"" << flush;
+        s << DOMString(toCatch.getSystemId()) << flush;
+        s << "\", line " << toCatch.getLineNumber() << flush;
+        s << ", column " << toCatch.getColumnNumber() << flush;
+        s << "\n   Message: " << DOMString(toCatch.getMessage()) << endl;
 
         ICE_PARSE_WARNING(s.str());
     }