5 files changed, 31 insertions, 23 deletions
diff --git a/cpp/demo/Ice/nested/Client.cpp b/cpp/demo/Ice/nested/Client.cpp
index b74d787539c..3ff33f4ca84 100644
--- a/cpp/demo/Ice/nested/Client.cpp
+++ b/cpp/demo/Ice/nested/Client.cpp
@@ -24,7 +24,7 @@ int
 main(int argc, char* argv[])
 {
     NestedClient app;
-    return app.main(argc, argv, "config");
+    return app.main(argc, argv, "config.client");
 }
 
 int
diff --git a/cpp/demo/Ice/nested/Server.cpp b/cpp/demo/Ice/nested/Server.cpp
index 3f47221f7b0..4ea63595ad2 100644
--- a/cpp/demo/Ice/nested/Server.cpp
+++ b/cpp/demo/Ice/nested/Server.cpp
@@ -24,7 +24,7 @@ int
 main(int argc, char* argv[])
 {
     NestedServer app;
-    return app.main(argc, argv, "config");
+    return app.main(argc, argv, "config.server");
 }
 
 int
diff --git a/cpp/demo/Ice/nested/config b/cpp/demo/Ice/nested/config
deleted file mode 100644
index ac570a355c8..00000000000
--- a/cpp/demo/Ice/nested/config
+++ /dev/null
@@ -1,21 +0,0 @@
-Nested.Server.Endpoints=default -p 10000 -t 10000
-
-Nested.Client.NestedServer=nestedServer:default -p 10000 -t 10000
-Nested.Client.Endpoints=default -t 10000
-
-Ice.ThreadPool.Server.Size=5
-Ice.ThreadPool.Server.SizeWarn=5
-Ice.ThreadPool.Server.SizeMax=10
-#Ice.Trace.Network=1
-#Ice.Trace.Protocol=1
-#Ice.Warn.Connections=1
-
-Ice.Plugin.IceSSL=IceSSL:create
-IceSSL.Client.DefaultDir=../../../certs
-IceSSL.Client.CertAuthFile=cacert.pem
-IceSSL.Client.CertFile=c_rsa1024_pub.pem
-IceSSL.Client.KeyFile=c_rsa1024_priv.pem
-IceSSL.Server.DefaultDir=../../../certs
-IceSSL.Server.CertAuthFile=cacert.pem
-IceSSL.Server.CertFile=s_rsa1024_pub.pem
-IceSSL.Server.KeyFile=s_rsa1024_priv.pem
diff --git a/cpp/demo/Ice/nested/config.client b/cpp/demo/Ice/nested/config.client
new file mode 100644
index 00000000000..a65086a9423
--- /dev/null
+++ b/cpp/demo/Ice/nested/config.client
@@ -0,0 +1,15 @@
+Nested.Client.NestedServer=nestedServer:default -p 10000 -t 10000
+Nested.Client.Endpoints=default -t 10000
+
+Ice.ThreadPool.Server.Size=5
+Ice.ThreadPool.Server.SizeWarn=5
+Ice.ThreadPool.Server.SizeMax=10
+#Ice.Trace.Network=1
+#Ice.Trace.Protocol=1
+#Ice.Warn.Connections=1
+
+Ice.Plugin.IceSSL=IceSSL:create
+IceSSL.DefaultDir=../../../certs
+IceSSL.CertAuthFile=cacert.pem
+IceSSL.CertFile=c_rsa1024_pub.pem
+IceSSL.KeyFile=c_rsa1024_priv.pem
diff --git a/cpp/demo/Ice/nested/config.server b/cpp/demo/Ice/nested/config.server
new file mode 100644
index 00000000000..afd8dab88af
--- /dev/null
+++ b/cpp/demo/Ice/nested/config.server
@@ -0,0 +1,14 @@
+Nested.Server.Endpoints=default -p 10000 -t 10000
+
+Ice.ThreadPool.Server.Size=5
+Ice.ThreadPool.Server.SizeWarn=5
+Ice.ThreadPool.Server.SizeMax=10
+#Ice.Trace.Network=1
+#Ice.Trace.Protocol=1
+#Ice.Warn.Connections=1
+
+Ice.Plugin.IceSSL=IceSSL:create
+IceSSL.DefaultDir=../../../certs
+IceSSL.CertAuthFile=cacert.pem
+IceSSL.CertFile=s_rsa1024_pub.pem
+IceSSL.KeyFile=s_rsa1024_priv.pem