Attachment #122494 for bug #165702

View | Details | Raw Unified | Return to bug 165702
Collapse All | Expand All

Lines 7-13 Link Here

(-)Makefile (-1 / +26 lines)
7		7
8	PORTNAME= Ice	8	PORTNAME= Ice
9	PORTVERSION= 3.4.2	9	PORTVERSION= 3.4.2
10	PORTREVISION= 1	10	PORTREVISION= 2
11	CATEGORIES= devel	11	CATEGORIES= devel
12	MASTER_SITES= http://download.zeroc.com/Ice/3.4/	12	MASTER_SITES= http://download.zeroc.com/Ice/3.4/
13		13
Lines 17-22 Link Here
17	LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \	17	LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2 \
18	mcpp.3:${PORTSDIR}/devel/mcpp	18	mcpp.3:${PORTSDIR}/devel/mcpp
19		19
		20	OPTIONS= TESTS "Build and run tests (requires lang/python)" on \
		21	DEMOS "Build demos" on
		22
		23	.include <bsd.port.options.mk>
		24
		25	.if defined(WITH_TESTS)
		26	USE_PYTHON_BUILD= yes
		27	.endif
		28
20	USE_GMAKE= yes	29	USE_GMAKE= yes
21	USE_ICONV= yes	30	USE_ICONV= yes
22	USE_BDB= 42+	31	USE_BDB= 42+
Lines 45-50 Link Here
45	MAKE_ENV= LP64=yes	54	MAKE_ENV= LP64=yes
46	.endif	55	.endif
47		56
		57	.if !defined(WITH_TESTS)
		58	MAKE_ENV+= NOTESTS=yes
		59	.endif
		60
		61	.if !defined(WITH_DEMOS)
		62	MAKE_ENV+= NODEMOS=yes
		63	.endif
		64
48	.if defined(NOPORTDOCS)	65	.if defined(NOPORTDOCS)
49	MAKE_ENV+= NOPORTDOCS=yes	66	MAKE_ENV+= NOPORTDOCS=yes
50	.endif	67	.endif
Lines 69-72 Link Here
69	${REINPLACE_CMD} '/LICENSE/s/prefix/install_slicedir/' \	86	${REINPLACE_CMD} '/LICENSE/s/prefix/install_slicedir/' \
70	${WRKSRC}/config/Make.common.rules	87	${WRKSRC}/config/Make.common.rules
71		88
		89	.if defined(WITH_TESTS)
		90	TEST_CMD= @cd ${BUILD_WRKSRC} && ${PYTHON_CMD} ./allTests.py
		91	post-build:
		92	${TEST_CMD}
		93	regression-test test: build
		94	${TEST_CMD}
		95	.endif
		96
72	.include <bsd.port.post.mk>	97	.include <bsd.port.post.mk>

Lines 1-12 Link Here

(-)files/patch-Makefile (-4 / +18 lines)
1	--- cpp/Makefile.bak 2008-05-16 19:24:00.000000000 +0200	1	--- cpp.orig/Makefile 2012-03-04 21:38:42.000000000 +0100
2	+++ cpp/Makefile 2008-07-31 13:37:25.000000000 +0200	2	+++ cpp/Makefile 2012-03-04 21:38:42.000000000 +0100
3	@@ -12,6 +12,9 @@	3	@@ -11,7 +11,22 @@
		4
4	include $(top_srcdir)/config/Make.rules	5	include $(top_srcdir)/config/Make.rules
5		6
6	SUBDIRS = config src include test demo	7	-SUBDIRS = config src include test demo
		8	+SUBDIRS = config src include
		9	+
		10	+ifeq ($(NOTESTS),)
		11	+SUBDIRS += test
		12	+endif
		13	+
		14	+ifeq ($(NODEMOS),)
		15	+SUBDIRS += demo
		16	+endif
		17	+
7	+ifeq ($(NOPORTDOCS),)	18	+ifeq ($(NOPORTDOCS),)
8	+SUBDIRS += doc	19	+SUBDIRS += doc
9	+endif	20	+endif
		21	+
		22	+ INSTALL_SUBDIRS = $(install_bindir) $(install_libdir) $(install_includedir) $(install_configdir)
		23	+
10		24
11	INSTALL_SUBDIRS = $(install_bindir) $(install_libdir) $(install_includedir) $(install_configdir)	25	INSTALL_SUBDIRS = $(install_bindir) $(install_libdir) $(install_includedir) $(install_configdir)
12		26




--- cpp.orig/allTests.py	2011-06-15 21:43:58.000000000 +0200
+++ cpp/allTests.py	2012-03-04 20:14:52.000000000 +0100
@@ -25,6 +25,7 @@
 # List of all basic tests.
 #
 tests = [ 
+
     ("IceUtil/condvar", ["once", "win32only"]),
     ("IceUtil/thread",  ["once"]),
     ("IceUtil/unicode", ["once"]),
@@ -62,7 +63,7 @@
     ("Ice/servantLocator", ["core"]),
     ("Ice/interceptor", ["core"]),
     ("Ice/stringConverter", ["core"]),
-    ("Ice/udp", ["core"]),
+    ("Ice/udp", ["core", "nofreebsdjail"]),
     ("Ice/defaultServant", ["core"]),
     ("Ice/defaultValue", ["core"]),
     ("Ice/invoke", ["core", "novc6"]),
@@ -106,8 +107,8 @@
 #
 if TestUtil.isWin32() or os.getuid() == 0:
     tests += [
-        ("IceUtil/priority", ["core", "nodarwin"]),
-        ("Ice/threadPoolPriority", ["core", "nodarwin"])
+        ("IceUtil/priority", ["core", "nodarwin", "nofreebsd"]),
+        ("Ice/threadPoolPriority", ["core", "nodarwin", "nofreebsd"])
         ]
 
 if __name__ == "__main__":




--- cpp.orig/demo/IceGrid/secure/README	2011-06-15 21:44:00.000000000 +0200
+++ cpp/demo/IceGrid/secure/README	2012-03-04 19:55:44.000000000 +0100
@@ -31,9 +31,10 @@
 the filesystem permissions to restrict access to the certificate.
 
 Once the certificates are generated, you can start the IceGrid
-registry, node, and Glacier2 router:
+registries, node, and Glacier2 router:
 
-$ icegridregistry --Ice.Config=config.registry
+$ icegridregistry --Ice.Config=config.master
+$ icegridregistry --Ice.Config=config.slave
 $ icegridnode --Ice.Config=config.node
 $ glacier2router --Ice.Config=config.glacier2
 




--- cpp.orig/demo/IceGrid/secure/application.xml	2011-06-15 21:43:58.000000000 +0200
+++ cpp/demo/IceGrid/secure/application.xml	2012-03-04 19:55:44.000000000 +0100
@@ -20,8 +20,8 @@
       <property name="IceSSL.DefaultDir" value="certs"/>
 
       <property name="Ice.Admin.Endpoints" value="ssl -h 127.0.0.1"/>
-      <property name="IceSSL.TrustOnly.Client" value="CN=IceGrid Registry"/>
-      <property name="IceSSL.TrustOnly.Server.Ice.Admin" value="CN=IceGrid Node"/>
+      <property name="IceSSL.TrustOnly.Client" value="CN=Master;CN=Slave"/>
+      <property name="IceSSL.TrustOnly.Server.Ice.Admin" value="CN=Node"/>
     </properties>
 
     <node name="Node">

Line 0 Link Here

(-)files/patch-cpp-demo-IceGrid-secure-config.admin (+11 lines)
	1	--- cpp.orig/demo/IceGrid/secure/config.admin 2011-06-15 21:43:58.000000000 +0200
	2	+++ cpp/demo/IceGrid/secure/config.admin 2012-03-04 19:55:44.000000000 +0100
	3	@@ -14,7 +14,7 @@
	4	# SSL Configuration
	5	#
	6	IceSSL.DefaultDir=certs
	7	-IceSSL.TrustOnly.Client=CN="IceGrid Registry";CN="Glacier2"
	8	+IceSSL.TrustOnly.Client=CN="Master";CN="Slave";CN="Glacier2"
	9
	10	# C++ configuration
	11	Ice.Plugin.IceSSL.cpp=IceSSL:createIceSSL

Line 0 Link Here

(-)files/patch-cpp-demo-IceGrid-secure-config.client (+11 lines)
	1	--- cpp.orig/demo/IceGrid/secure/config.client 2011-06-15 21:43:58.000000000 +0200
	2	+++ cpp/demo/IceGrid/secure/config.client 2012-03-04 19:55:44.000000000 +0100
	3	@@ -1,7 +1,7 @@
	4	#
	5	# The IceGrid locator proxy.
	6	#
	7	-Ice.Default.Locator=DemoIceGrid/Locator:tcp -p 4061
	8	+Ice.Default.Locator=DemoIceGrid/Locator:tcp -p 4061:tcp -p 14061
	9
	10	#
	11	# Trace properties.




--- cpp.orig/demo/IceGrid/secure/config.master	2012-03-04 19:55:44.000000000 +0100
+++ cpp/demo/IceGrid/secure/config.master	2012-03-04 19:55:44.000000000 +0100
@@ -0,0 +1,61 @@
+#
+# The IceGrid instance name.
+#
+IceGrid.InstanceName=DemoIceGrid
+
+#
+# IceGrid registry configuration.
+#
+IceGrid.Registry.Client.Endpoints=tcp -p 4061 -t 10000:ssl -p 4062 -t 10000
+IceGrid.Registry.Server.Endpoints=ssl -t 10000
+IceGrid.Registry.Internal.Endpoints=ssl -t 10000
+IceGrid.Registry.Data=db/master
+
+#
+# Ensure that nodes and slaves connecting to this registry have a name
+# matching the certificate CN.
+#
+IceGrid.Registry.RequireNodeCertCN=1
+IceGrid.Registry.RequireReplicaCertCN=1
+
+#
+# IceGrid admin clients must use a secure connection to connect to the
+# registry or use Glacier2.
+#
+IceGrid.Registry.AdminSessionManager.Endpoints=ssl -t 10000
+IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
+
+#
+# IceGrid SQL configuration if using SQL database.
+#
+#Ice.Plugin.DB=IceGridSqlDB:createSqlDB
+#IceGrid.SQL.DatabaseType=QSQLITE
+#IceGrid.SQL.DatabaseName=db/master/Registry.db
+
+#
+# Trace properties.
+#
+Ice.ProgramName=Master
+IceGrid.Registry.Trace.Node=2
+IceGrid.Registry.Trace.Replica=2
+
+#
+# SSL Configuration
+#
+Ice.Plugin.IceSSL=IceSSL:createIceSSL
+IceSSL.DefaultDir=certs
+IceSSL.CertAuthFile=ca_cert.pem
+IceSSL.CertFile=master_cert.pem
+IceSSL.KeyFile=master_key.pem
+
+#
+# Don't require certificates. This is useful for admin clients that don't
+# use certificate but still need to establish a secure connection for the
+# username/password authentication
+#
+IceSSL.VerifyPeer=1
+
+IceSSL.TrustOnly.Client=CN="Master";CN="Slave";CN="Node";CN="Glacier2"
+IceSSL.TrustOnly.Server.IceGrid.Registry.Server=CN="Server"
+IceSSL.TrustOnly.Server.IceGrid.Registry.Internal=CN="Node";CN="Master";CN="Slave"
+IceSSL.TrustOnly.Server.IceGrid.Registry.AdminSessionManager=CN="Glacier2"




--- cpp.orig/demo/IceGrid/secure/config.node	2011-06-15 21:43:58.000000000 +0200
+++ cpp/demo/IceGrid/secure/config.node	2012-03-04 19:55:44.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # The IceGrid locator proxy.
 #
-Ice.Default.Locator=DemoIceGrid/Locator:ssl -p 4062 -t 10000
+Ice.Default.Locator=DemoIceGrid/Locator:ssl -p 4062 -t 10000:ssl -p 14062 -t 10000
 
 #
 # IceGrid node configuration.
@@ -26,5 +26,5 @@
 IceSSL.CertFile=node_cert.pem
 IceSSL.KeyFile=node_key.pem
 
-IceSSL.TrustOnly.Client=CN="Server";CN="IceGrid Registry"
-IceSSL.TrustOnly.Server=CN="IceGrid Registry"
+IceSSL.TrustOnly.Client=CN="Server";CN="Master";CN="Slave"
+IceSSL.TrustOnly.Server=CN="Master";CN="Slave"




--- cpp.orig/demo/IceGrid/secure/config.registry	2011-06-15 21:43:58.000000000 +0200
+++ cpp/demo/IceGrid/secure/config.registry	2012-03-04 19:55:44.000000000 +0100
@@ -1,54 +0,0 @@
-#
-# The IceGrid instance name.
-#
-IceGrid.InstanceName=DemoIceGrid
-
-#
-# IceGrid registry configuration.
-#
-IceGrid.Registry.Client.Endpoints=tcp -p 4061 -t 10000:ssl -p 4062 -t 10000
-IceGrid.Registry.Server.Endpoints=ssl -t 10000
-IceGrid.Registry.Internal.Endpoints=ssl -t 10000
-IceGrid.Registry.Data=db/registry
-
-#
-# IceGrid admin clients must use a secure connection to connect to the
-# registry or use Glacier2.
-#
-IceGrid.Registry.AdminSessionManager.Endpoints=ssl -t 10000
-IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
-
-#
-# IceGrid SQL configuration if using SQL database.
-#
-#Ice.Plugin.DB=IceGridSqlDB:createSqlDB
-#IceGrid.SQL.DatabaseType=QSQLITE
-#IceGrid.SQL.DatabaseName=db/registry/Registry.db
-
-#
-# Trace properties.
-#
-Ice.ProgramName=Registry
-IceGrid.Registry.Trace.Node=2
-IceGrid.Registry.Trace.Replica=2
-
-#
-# SSL Configuration
-#
-Ice.Plugin.IceSSL=IceSSL:createIceSSL
-IceSSL.DefaultDir=certs
-IceSSL.CertAuthFile=ca_cert.pem
-IceSSL.CertFile=registry_cert.pem
-IceSSL.KeyFile=registry_key.pem
-
-#
-# Don't require certificates. This is useful for admin clients that don't
-# use certificate but still need to establish a secure connection for the
-# username/password authentication
-#
-IceSSL.VerifyPeer=1
-
-IceSSL.TrustOnly.Client=CN="IceGrid Registry";CN="IceGrid Node";CN="Glacier2"
-IceSSL.TrustOnly.Server.IceGrid.Registry.Server=CN="Server"
-IceSSL.TrustOnly.Server.IceGrid.Registry.Internal=CN="IceGrid Node";CN="IceGrid Registry"
-IceSSL.TrustOnly.Server.IceGrid.Registry.AdminSessionManager=CN="Glacier2"




--- cpp.orig/demo/IceGrid/secure/config.slave	2012-03-04 19:55:44.000000000 +0100
+++ cpp/demo/IceGrid/secure/config.slave	2012-03-04 19:55:44.000000000 +0100
@@ -0,0 +1,66 @@
+#
+# The IceGrid locator proxy.
+#
+Ice.Default.Locator=DemoIceGrid/Locator:ssl -p 4062 -t 10000
+
+#
+# The IceGrid instance name.
+#
+IceGrid.InstanceName=DemoIceGrid
+
+#
+# IceGrid registry configuration.
+#
+IceGrid.Registry.Client.Endpoints=tcp -p 14061 -t 10000:ssl -p 14062 -t 10000
+IceGrid.Registry.Server.Endpoints=ssl -t 10000
+IceGrid.Registry.Internal.Endpoints=ssl -t 10000
+IceGrid.Registry.Data=db/slave
+IceGrid.Registry.ReplicaName=Slave
+
+#
+# Ensure that nodes connecting to this registry have a name matching
+# the certificate CN.
+#
+IceGrid.Registry.RequireNodeCertCN=1
+
+#
+# IceGrid admin clients must use a secure connection to connect to the
+# registry or use Glacier2.
+#
+IceGrid.Registry.AdminSessionManager.Endpoints=ssl -t 10000
+IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
+
+#
+# IceGrid SQL configuration if using SQL database.
+#
+#Ice.Plugin.DB=IceGridSqlDB:createSqlDB
+#IceGrid.SQL.DatabaseType=QSQLITE
+#IceGrid.SQL.DatabaseName=db/slave/Registry.db
+
+#
+# Trace properties.
+#
+Ice.ProgramName=Slave
+IceGrid.Registry.Trace.Node=2
+IceGrid.Registry.Trace.Replica=2
+
+#
+# SSL Configuration
+#
+Ice.Plugin.IceSSL=IceSSL:createIceSSL
+IceSSL.DefaultDir=certs
+IceSSL.CertAuthFile=ca_cert.pem
+IceSSL.CertFile=slave_cert.pem
+IceSSL.KeyFile=slave_key.pem
+
+#
+# Don't require certificates. This is useful for admin clients that don't
+# use certificate but still need to establish a secure connection for the
+# username/password authentication
+#
+IceSSL.VerifyPeer=1
+
+IceSSL.TrustOnly.Client=CN="Master";CN="Slave";CN="Node";CN="Glacier2"
+IceSSL.TrustOnly.Server.IceGrid.Registry.Server=CN="Server"
+IceSSL.TrustOnly.Server.IceGrid.Registry.Internal=CN="Node";CN="Master";CN="Slave"
+IceSSL.TrustOnly.Server.IceGrid.Registry.AdminSessionManager=CN="Glacier2"




--- cpp.orig/demo/IceGrid/secure/makecerts.py	2011-06-15 21:43:58.000000000 +0200
+++ cpp/demo/IceGrid/secure/makecerts.py	2012-03-04 19:55:44.000000000 +0100
@@ -44,8 +44,9 @@
 print
 print
 
-createCertificate("registry", "IceGrid Registry")
-createCertificate("node", "IceGrid Node")
+createCertificate("master", "Master")
+createCertificate("slave", "Slave")
+createCertificate("node", "Node")
 createCertificate("glacier2", "Glacier2")
 createCertificate("server", "Server")
 

Line 0 Link Here

(-)files/patch-cpp-include-Freeze-Map.h (+11 lines)
	1	--- cpp.orig/include/Freeze/Map.h 2011-06-15 21:43:58.000000000 +0200
	2	+++ cpp/include/Freeze/Map.h 2012-03-04 20:14:52.000000000 +0100
	3	@@ -426,7 +426,7 @@
	4
	5	ConstIterator(MapHelper& mapHelper, const Ice::CommunicatorPtr& communicator) :
	6	_helper(IteratorHelper::create(mapHelper, true)),
	7	- _communicator(_communicator),
	8	+ _communicator(communicator),
	9	_refValid(false)
	10	{
	11	}

Line 0 Link Here

(-)files/patch-cpp-include-Ice-Buffer.h (+10 lines)
	1	--- cpp.orig/include/Ice/Buffer.h 2011-06-15 21:43:58.000000000 +0200
	2	+++ cpp/include/Ice/Buffer.h 2012-03-04 20:14:52.000000000 +0100
	3	@@ -10,6 +10,7 @@
	4	#ifndef ICEE_BUFFER_H
	5	#define ICEE_BUFFER_H
	6
	7	+#include <cstddef>
	8	#include <Ice/Config.h>
	9
	10	namespace IceInternal




--- cpp.orig/include/Ice/ConnectionIF.h	2011-06-15 21:43:58.000000000 +0200
+++ cpp/include/Ice/ConnectionIF.h	2012-03-04 20:14:52.000000000 +0100
@@ -17,13 +17,13 @@
 {
 
 class ConnectionI;
+ICE_API Ice::LocalObject* upCast(Ice::ConnectionI*);
 
 }
 
 namespace IceInternal
 {
 
-ICE_API Ice::LocalObject* upCast(Ice::ConnectionI*);
 
 enum AsyncStatus
 {




--- cpp.orig/include/Ice/IconvStringConverter.h	2011-06-15 21:43:58.000000000 +0200
+++ cpp/include/Ice/IconvStringConverter.h	2012-03-04 20:14:52.000000000 +0100
@@ -225,10 +225,16 @@
 template<typename charT> /*static*/ void
 IconvStringConverter<charT>::close(std::pair<iconv_t, iconv_t> cdp)
 {
-    int rs = iconv_close(cdp.first);
+#ifndef NDEBUG
+    int rs = 
+#endif
+    iconv_close(cdp.first);
     assert(rs == 0);
 
-    rs = iconv_close(cdp.second);
+#ifndef NDEBUG
+    rs = 
+#endif
+    iconv_close(cdp.second);
     assert(rs == 0);
 }
  




--- cpp.orig/include/Ice/IncomingAsyncF.h	2011-06-15 21:43:58.000000000 +0200
+++ cpp/include/Ice/IncomingAsyncF.h	2012-03-04 20:14:52.000000000 +0100
@@ -28,12 +28,6 @@
 
 class AMD_Object_ice_invoke;
 class AMD_Array_Object_ice_invoke;
-
-}
-
-namespace IceInternal
-{
-
 ICE_API IceUtil::Shared* upCast(::Ice::AMD_Object_ice_invoke*);
 ICE_API IceUtil::Shared* upCast(::Ice::AMD_Array_Object_ice_invoke*);
 




--- cpp.orig/include/Ice/LocalObjectF.h	2011-06-15 21:43:58.000000000 +0200
+++ cpp/include/Ice/LocalObjectF.h	2012-03-04 20:14:52.000000000 +0100
@@ -18,12 +18,6 @@
 {
 
 class LocalObject;
-
-}
-
-namespace IceInternal
-{
-
 ICE_API IceUtil::Shared* upCast(::Ice::LocalObject*);
 
 }




--- cpp.orig/include/Ice/ObjectF.h	2011-06-15 21:43:58.000000000 +0200
+++ cpp/include/Ice/ObjectF.h	2012-03-04 20:14:52.000000000 +0100
@@ -17,19 +17,8 @@
 {
 
 class Object;
-
-}
-
-namespace IceInternal
-{
-
 ICE_API IceUtil::Shared* upCast(::Ice::Object*);
 
-}
-
-namespace Ice
-{
-
 typedef IceInternal::Handle< Object > ObjectPtr;
 
 void ICE_API __patch__ObjectPtr(void*, ObjectPtr&);




--- cpp.orig/include/Ice/OutgoingAsyncF.h	2011-06-15 21:43:58.000000000 +0200
+++ cpp/include/Ice/OutgoingAsyncF.h	2012-03-04 20:14:52.000000000 +0100
@@ -19,13 +19,13 @@
 
 class AsyncResult;
 typedef IceInternal::Handle<AsyncResult> AsyncResultPtr;
+ICE_API IceUtil::Shared* upCast(::Ice::AsyncResult*);
 
 }
 
 namespace IceInternal
 {
 
-ICE_API IceUtil::Shared* upCast(::Ice::AsyncResult*);
 
 class OutgoingAsync;
 ICE_API IceUtil::Shared* upCast(OutgoingAsync*);




--- cpp.orig/include/Ice/Proxy.h	2011-06-15 21:43:58.000000000 +0200
+++ cpp/include/Ice/Proxy.h	2012-03-04 20:14:52.000000000 +0100
@@ -38,6 +38,8 @@
 
 class Locator;
 class Router;
+ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::Locator*);
+ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::Router*);
 
 }
 
@@ -46,8 +48,6 @@
 namespace IceInternal
 {
 
-ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::Locator*);
-ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::Router*);
 
 class LocalExceptionWrapper;
 
@@ -1172,7 +1172,7 @@
 
     TwowayCallbackNC(const TPtr& instance, bool cb, Exception excb, Sent sentcb) : CallbackNC<T>(instance, excb, sentcb)
     {
-        checkCallback(instance, cb || excb != 0);
+        this->checkCallback(instance, cb || excb != 0);
     }
 };
 
@@ -1188,7 +1188,7 @@
 
     TwowayCallback(const TPtr& instance, bool cb, Exception excb, Sent sentcb) : Callback<T, CT>(instance, excb, sentcb)
     {
-        checkCallback(instance, cb || excb != 0);
+        this->checkCallback(instance, cb || excb != 0);
     }
 };
 
@@ -1209,7 +1209,7 @@
     OnewayCallbackNC(const TPtr& instance, Response cb, Exception excb, Sent sentcb) : 
         CallbackNC<T>(instance, excb, sentcb), response(cb)
     {
-        checkCallback(instance, cb != 0 || excb != 0);
+        this->checkCallback(instance, cb != 0 || excb != 0);
     }
 
     virtual void __completed(const ::Ice::AsyncResultPtr& result) const
@@ -1254,7 +1254,7 @@
     OnewayCallback(const TPtr& instance, Response cb, Exception excb, Sent sentcb) : 
         Callback<T, CT>(instance, excb, sentcb),  response(cb)
     {
-        checkCallback(instance, cb != 0 || excb != 0);
+        this->checkCallback(instance, cb != 0 || excb != 0);
     }
 
     virtual void __completed(const ::Ice::AsyncResultPtr& result) const




--- cpp.orig/include/Ice/ProxyF.h	2011-06-15 21:43:58.000000000 +0200
+++ cpp/include/Ice/ProxyF.h	2012-03-04 20:14:52.000000000 +0100
@@ -22,6 +22,11 @@
 {
 
 class Object;
+inline ::IceProxy::Ice::Object* 
+upCast(::IceProxy::Ice::Object* o)
+{
+    return o;
+}
 
 }
 
@@ -34,6 +39,11 @@
 {
 
 class Object;
+inline ::IceDelegate::Ice::Object*
+upCast(::IceDelegate::Ice::Object* o)
+{
+    return o;
+}
 
 }
 
@@ -47,6 +57,12 @@
 
 class Object;
 
+inline ::IceDelegateM::Ice::Object*
+upCast(::IceDelegateM::Ice::Object* o)
+{
+    return o;
+}
+
 }
 
 }
@@ -58,36 +74,12 @@
 {
 
 class Object;
-
-}
-
-}
-
-namespace IceInternal
-{
-
-inline ::IceProxy::Ice::Object* 
-upCast(::IceProxy::Ice::Object* o)
-{
-    return o;
-}
-
-inline ::IceDelegate::Ice::Object*
-upCast(::IceDelegate::Ice::Object* o)
-{
-    return o;
-}
-
 inline ::IceDelegateD::Ice::Object*
 upCast(::IceDelegateD::Ice::Object* o)
 {
     return o;
 }
 
-inline ::IceDelegateM::Ice::Object*
-upCast(::IceDelegateM::Ice::Object* o)
-{
-    return o;
 }
 
 }




--- cpp.orig/include/Ice/Stream.h	2011-06-15 21:43:58.000000000 +0200
+++ cpp/include/Ice/Stream.h	2012-03-04 20:14:52.000000000 +0100
@@ -17,6 +17,12 @@
 #include <Ice/Proxy.h>
 #include <IceUtil/Shared.h>
 
+namespace IceInternal
+{
+    // Forward declaration required for writer specializations.
+    void delegateThrowMarshalException(const char*, int, const ::std::string&);
+}
+
 namespace Ice
 {
     
@@ -45,9 +51,6 @@
     StreamTraitTypeUnknown
 };
 
-// Forward declaration required for writer specializations.
-class MarshalException;
-
 //
 // Base trait template. This doesn't actually do anything -- we just
 // use it as a template that we can specialize.
@@ -542,7 +545,7 @@
     {
         if(static_cast<int>(v) < 0 || static_cast<int>(v) >= StreamTrait<T>::enumLimit)
         {
-            throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
+            IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
         }
         outS->write(static_cast<Byte>(v));
     }
@@ -558,7 +561,7 @@
         inS->read(val);
         if(val > StreamTrait<T>::enumLimit)
         {
-            throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
+            IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
         }
         v = static_cast<T>(val);
     }
@@ -573,7 +576,7 @@
     {
         if(static_cast<int>(v) < 0 || static_cast<int>(v) >= StreamTrait<T>::enumLimit)
         {
-            throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
+            IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
         }
         outS->write(static_cast<Short>(v));
     }
@@ -589,7 +592,7 @@
         inS->read(val);
         if(val < 0 || val > StreamTrait<T>::enumLimit)
         {
-            throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
+            IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
         }
         v = static_cast<T>(val);
     }
@@ -603,7 +606,7 @@
     {
         if(static_cast<int>(v) < 0 || static_cast<int>(v) >= StreamTrait<T>::enumLimit)
         {
-            throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
+            IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
         }
         outS->write(static_cast<Int>(v));
     }
@@ -619,7 +622,7 @@
         inS->read(val);
         if(val < 0 || val > StreamTrait<T>::enumLimit)
         {
-            throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
+            IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
         }
         v = static_cast<T>(val);
     }




--- cpp.orig/include/Ice/StreamF.h	2011-06-15 21:43:58.000000000 +0200
+++ cpp/include/Ice/StreamF.h	2012-03-04 20:14:52.000000000 +0100
@@ -19,12 +19,6 @@
 
 class InputStream;
 class OutputStream;
-
-}
-
-namespace IceInternal
-{
-
 ICE_API IceUtil::Shared* upCast(::Ice::InputStream*);
 ICE_API IceUtil::Shared* upCast(::Ice::OutputStream*);
 




--- cpp.orig/include/IceUtil/Mutex.h	2011-06-15 21:43:58.000000000 +0200
+++ cpp/include/IceUtil/Mutex.h	2012-03-04 20:14:52.000000000 +0100
@@ -251,8 +251,11 @@
 inline
 Mutex::~Mutex()
 {
+#ifndef NDEBUG
     int rc = 0;
-    rc = pthread_mutex_destroy(&_mutex);
+    rc = 
+#endif    
+    pthread_mutex_destroy(&_mutex);
     assert(rc == 0);
 }
 




--- cpp.orig/src/Freeze/MapDb.cpp	2011-06-15 21:43:58.000000000 +0200
+++ cpp/src/Freeze/MapDb.cpp	2012-03-04 20:14:52.000000000 +0100
@@ -229,7 +229,11 @@
 #ifndef NDEBUG
                 bool inserted = 
 #endif
-                    _indices.insert(IndexMap::value_type(indexBase->name(), indexI.get())).second;
+                    _indices.insert(IndexMap::value_type(indexBase->name(), indexI.get()))
+#ifndef NDEBUG                    
+                    .second
+#endif
+                ;
                 assert(inserted);
                 
                 indexBase->_impl = indexI.release();




--- cpp.orig/src/Freeze/MapI.cpp	2011-06-15 21:43:58.000000000 +0200
+++ cpp/src/Freeze/MapI.cpp	2012-03-04 20:14:52.000000000 +0100
@@ -749,8 +749,11 @@
 
     try
     {
+#ifndef NDEBUG
         int err;
-        err = _dbc->put(&dbKey, &dbValue, DB_CURRENT);
+        err = 
+#endif
+        _dbc->put(&dbKey, &dbValue, DB_CURRENT);
         assert(err == 0);
     }
     catch(const ::DbDeadlockException& dx)
@@ -1023,7 +1026,11 @@
 #ifndef NDEBUG
         bool inserted =
 #endif 
-            _indices.insert(IndexMap::value_type(indexBase->name(), indexBase)).second;
+            _indices.insert(IndexMap::value_type(indexBase->name(), indexBase))
+#ifndef NDEBUG
+            .second
+#endif
+            ;
         assert(inserted);
         indexBase->_map = this;
     }
@@ -1360,8 +1367,11 @@
         try
         {
             u_int32_t count;
+#ifndef NDEBUG
             int err;
-            err = _db->truncate(txn, &count, txn != 0 ? 0 : DB_AUTO_COMMIT);
+            err = 
+#endif            
+            _db->truncate(txn, &count, txn != 0 ? 0 : DB_AUTO_COMMIT);
             assert(err == 0);
             break;
         }




--- cpp.orig/src/Freeze/SharedDbEnv.cpp	2011-06-15 21:43:58.000000000 +0200
+++ cpp/src/Freeze/SharedDbEnv.cpp	2012-03-04 20:14:52.000000000 +0100
@@ -336,8 +336,11 @@
         // Remove from map
         //
      
+#ifndef NDEBUG
         size_t one;
-        one = sharedDbEnvMap->erase(key);
+        one = 
+#endif
+        sharedDbEnvMap->erase(key);
         assert(one == 1);
 
         if(sharedDbEnvMap->size() == 0)




--- cpp.orig/src/Glacier2/Blobject.cpp	2011-06-15 21:43:58.000000000 +0200
+++ cpp/src/Glacier2/Blobject.cpp	2012-03-04 19:39:27.000000000 +0100
@@ -171,6 +171,15 @@
 }
 
 void
+Glacier2::Blobject::destroy()
+{
+    if(_requestQueue)
+    {
+        _requestQueue->destroy();
+    }
+}
+
+void
 Glacier2::Blobject::invoke(ObjectPrx& proxy, const AMD_Object_ice_invokePtr& amdCB, 
                            const std::pair<const Ice::Byte*, const Ice::Byte*>& inParams, const Current& current)
 {

Line 0 Link Here

(-)files/patch-cpp-src-Glacier2-Blobject.h (+11 lines)
	1	--- cpp.orig/src/Glacier2/Blobject.h 2011-06-15 21:43:58.000000000 +0200
	2	+++ cpp/src/Glacier2/Blobject.h 2012-03-04 19:39:27.000000000 +0100
	3	@@ -24,6 +24,8 @@
	4	Blobject(const InstancePtr&, const Ice::ConnectionPtr&, const Ice::Context&);
	5	virtual ~Blobject();
	6
	7	+ void destroy();
	8	+
	9	protected:
	10
	11	void invoke(Ice::ObjectPrx&, const Ice::AMD_Object_ice_invokePtr&,




--- cpp.orig/src/Glacier2/RequestQueue.cpp	2011-06-15 21:43:58.000000000 +0200
+++ cpp/src/Glacier2/RequestQueue.cpp	2012-03-04 19:39:27.000000000 +0100
@@ -185,7 +185,8 @@
     _callback(newCallback_Object_ice_invoke(this, &RequestQueue::response, &RequestQueue::exception,
                                             &RequestQueue::sent)),
     _flushCallback(newCallback_Connection_flushBatchRequests(this, &RequestQueue::exception, &RequestQueue::sent)),
-    _pendingSend(false)
+    _pendingSend(false),
+    _destroyed(false)
 {
 }
 
@@ -241,6 +242,37 @@
 }
 
 void
+Glacier2::RequestQueue::destroy()
+{
+    IceUtil::Mutex::Lock lock(*this);
+
+    _destroyed = true;
+
+    //
+    // Although the session has been destroyed, we cannot destroy this queue
+    // until all requests have completed.
+    //
+    if(_requests.empty())
+    {
+        destroyInternal();
+    }
+}
+
+void
+Glacier2::RequestQueue::destroyInternal()
+{
+    //
+    // Must be called with the mutex locked.
+    //
+
+    //
+    // Remove cyclic references.
+    //
+    const_cast<Ice::Callback_Object_ice_invokePtr&>(_callback) = 0;
+    const_cast<Ice::Callback_Connection_flushBatchRequestsPtr&>(_flushCallback) = 0;
+}
+
+void
 Glacier2::RequestQueue::flush()
 {
     assert(_connection);
@@ -289,6 +321,11 @@
             _pendingSendRequest = 0;
         }
     }
+
+    if(_destroyed && _requests.empty())
+    {
+        destroyInternal();
+    }
 }
 
 void
@@ -312,6 +349,11 @@
         }
     }
     _requests.clear();
+
+    if(_destroyed)
+    {
+        destroyInternal();
+    }
 }
 
 void




--- cpp.orig/src/Glacier2/RequestQueue.h	2011-06-15 21:43:58.000000000 +0200
+++ cpp/src/Glacier2/RequestQueue.h	2012-03-04 19:39:27.000000000 +0100
@@ -65,8 +65,12 @@
     bool addRequest(const RequestPtr&);
     void flushRequests(std::set<Ice::ObjectPrx>&);
 
+    void destroy();
+
 private:
 
+    void destroyInternal();
+
     void flush();
     void flush(std::set<Ice::ObjectPrx>&);
 
@@ -83,6 +87,7 @@
     std::deque<RequestPtr> _requests;
     bool _pendingSend;
     RequestPtr _pendingSendRequest;
+    bool _destroyed;
 };
 typedef IceUtil::Handle<RequestQueue> RequestQueuePtr;
 




--- cpp.orig/src/Glacier2/RouterI.cpp	2011-06-15 21:43:58.000000000 +0200
+++ cpp/src/Glacier2/RouterI.cpp	2012-03-04 19:39:27.000000000 +0100
@@ -98,6 +98,12 @@
             _session->destroy_async(amiCB);
         }
     }
+
+    _clientBlobject->destroy();
+    if(_serverBlobject)
+    {
+        _serverBlobject->destroy();
+    }
 }
 
 ObjectPrx




--- cpp.orig/src/Ice/ConnectionI.cpp	2011-06-15 21:43:58.000000000 +0200
+++ cpp/src/Ice/ConnectionI.cpp	2012-03-04 20:14:52.000000000 +0100
@@ -31,7 +31,7 @@
 using namespace Ice;
 using namespace IceInternal;
 
-Ice::LocalObject* IceInternal::upCast(ConnectionI* p) { return p; }
+Ice::LocalObject* Ice::upCast(ConnectionI* p) { return p; }
 
 namespace
 {
@@ -600,6 +600,7 @@
     }
     catch(const LocalException& ex)
     {
+        status = IceInternal::AsyncStatusQueued; // this is only to apeace the compiler
         setState(StateClosed, ex);
         assert(_exception.get());
         _exception->ice_throw();
@@ -971,6 +972,7 @@
     }
     catch(const Ice::LocalException& ex)
     {
+        status = IceInternal::AsyncStatusQueued; // this is only to apeace the compiler
         setState(StateClosed, ex);
         assert(_exception.get());
         _exception->ice_throw();

Line 0 Link Here

(-)files/patch-cpp-src-Ice-IncomingAsync.cpp (+11 lines)
	1	--- cpp.orig/src/Ice/IncomingAsync.cpp 2011-06-15 21:43:58.000000000 +0200
	2	+++ cpp/src/Ice/IncomingAsync.cpp 2012-03-04 20:14:52.000000000 +0100
	3	@@ -24,7 +24,7 @@
	4	using namespace IceInternal;
	5
	6	IceUtil::Shared* IceInternal::upCast(IncomingAsync* p) { return p; }
	7	-IceUtil::Shared* IceInternal::upCast(AMD_Object_ice_invoke* p) { return p; }
	8	+IceUtil::Shared* Ice::upCast(AMD_Object_ice_invoke* p) { return p; }
	9
	10	namespace
	11	{

Line 0 Link Here

(-)files/patch-cpp-src-Ice-LocalObject.cpp (+11 lines)
	1	--- cpp.orig/src/Ice/LocalObject.cpp 2011-06-15 21:43:58.000000000 +0200
	2	+++ cpp/src/Ice/LocalObject.cpp 2012-03-04 20:14:52.000000000 +0100
	3	@@ -13,7 +13,7 @@
	4	using namespace Ice;
	5	using namespace IceInternal;
	6
	7	-IceUtil::Shared* IceInternal::upCast(LocalObject* obj) { return obj; }
	8	+IceUtil::Shared* Ice::upCast(LocalObject* obj) { return obj; }
	9
	10	bool
	11	Ice::LocalObject::operator==(const LocalObject& r) const

Line 0 Link Here

(-)files/patch-cpp-src-Ice-Object.cpp (+11 lines)
	1	--- cpp.orig/src/Ice/Object.cpp 2011-06-15 21:43:58.000000000 +0200
	2	+++ cpp/src/Ice/Object.cpp 2012-03-04 20:14:52.000000000 +0100
	3	@@ -19,7 +19,7 @@
	4	using namespace Ice;
	5	using namespace IceInternal;
	6
	7	-IceUtil::Shared* IceInternal::upCast(Object* p) { return p; }
	8	+IceUtil::Shared* Ice::upCast(Object* p) { return p; }
	9
	10	bool
	11	Ice::Object::operator==(const Object& r) const

Line 0 Link Here

(-)files/patch-cpp-src-Ice-OutgoingAsync.cpp (+11 lines)
	1	--- cpp.orig/src/Ice/OutgoingAsync.cpp 2011-06-15 21:43:59.000000000 +0200
	2	+++ cpp/src/Ice/OutgoingAsync.cpp 2012-03-04 20:14:52.000000000 +0100
	3	@@ -30,7 +30,7 @@
	4	using namespace Ice;
	5	using namespace IceInternal;
	6
	7	-IceUtil::Shared* IceInternal::upCast(AsyncResult* p) { return p; }
	8	+IceUtil::Shared* Ice::upCast(AsyncResult* p) { return p; }
	9
	10	IceUtil::Shared* IceInternal::upCast(OutgoingAsyncMessageCallback* p) { return p; }
	11	IceUtil::Shared* IceInternal::upCast(OutgoingAsync* p) { return p; }




--- cpp.orig/src/Ice/PropertyNames.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/Ice/PropertyNames.cpp	2012-03-04 19:55:44.000000000 +0100
@@ -8,7 +8,7 @@
 // **********************************************************************
 
 //
-// Generated by makeprops.py from file ..\config\PropertyNames.xml, Mon May 09 07:39:43 2011
+// Generated by makeprops.py from file ../config/PropertyNames.xml, Tue Jul 12 07:22:34 2011
 
 // IMPORTANT: Do not edit this file -- any edits made here will be lost!
 
@@ -335,6 +335,8 @@
     IceInternal::Property("IceGrid.Registry.PermissionsVerifier", false, 0),
     IceInternal::Property("IceGrid.Registry.ReplicaName", false, 0),
     IceInternal::Property("IceGrid.Registry.ReplicaSessionTimeout", false, 0),
+    IceInternal::Property("IceGrid.Registry.RequireNodeCertCN", false, 0),
+    IceInternal::Property("IceGrid.Registry.RequireReplicaCertCN", false, 0),
     IceInternal::Property("IceGrid.Registry.Server.ACM", false, 0),
     IceInternal::Property("IceGrid.Registry.Server.AdapterId", false, 0),
     IceInternal::Property("IceGrid.Registry.Server.Endpoints", false, 0),

Line 0 Link Here

(-)files/patch-cpp-src-Ice-PropertyNames.h (+11 lines)
	1	--- cpp.orig/src/Ice/PropertyNames.h 2011-06-15 21:43:59.000000000 +0200
	2	+++ cpp/src/Ice/PropertyNames.h 2012-03-04 19:55:44.000000000 +0100
	3	@@ -8,7 +8,7 @@
	4	// **********************************************************************
	5
	6	//
	7	-// Generated by makeprops.py from file ..\config\PropertyNames.xml, Mon May 09 07:39:43 2011
	8	+// Generated by makeprops.py from file ../config/PropertyNames.xml, Tue Jul 12 07:22:34 2011
	9
	10	// IMPORTANT: Do not edit this file -- any edits made here will be lost!
	11

Line 0 Link Here

(-)files/patch-cpp-src-Ice-ProxyFactory.cpp (+10 lines)
	1	--- cpp.orig/src/Ice/ProxyFactory.cpp 2011-06-15 21:43:59.000000000 +0200
	2	+++ cpp/src/Ice/ProxyFactory.cpp 2012-03-04 20:14:53.000000000 +0100
	3	@@ -229,6 +229,7 @@
	4	}
	5	else if(cnt > static_cast<int>(_retryIntervals.size()))
	6	{
	7	+ interval = 0; // apeace compiler
	8	if(traceLevels->retry >= 1)
	9	{
	10	Trace out(logger, traceLevels->retryCat);

Line 0 Link Here

(-)files/patch-cpp-src-Ice-Service.cpp (+32 lines)
	1	--- cpp.orig/src/Ice/Service.cpp 2011-06-15 21:43:59.000000000 +0200
	2	+++ cpp/src/Ice/Service.cpp 2012-03-04 20:14:53.000000000 +0100
	3	@@ -2136,17 +2136,26 @@
	4	//
	5	// Associate stdin, stdout and stderr with /dev/null.
	6	//
	7	+#ifndef NDEBUG
	8	int fd;
	9	- fd = open("/dev/null", O_RDWR);
	10	+ fd =
	11	+#endif
	12	+ open("/dev/null", O_RDWR);
	13	assert(fd == 0);
	14	if(stdOut.empty())
	15	{
	16	- fd = dup2(0, 1);
	17	+#ifndef NDEBUG
	18	+ fd =
	19	+#endif
	20	+ dup2(0, 1);
	21	assert(fd == 1);
	22	}
	23	if(stdErr.empty())
	24	{
	25	- fd = dup2(1, 2);
	26	+#ifndef NDEBUG
	27	+ fd =
	28	+#endif
	29	+ dup2(1, 2);
	30	assert(fd == 2);
	31	}
	32	}




--- cpp.orig/src/Ice/Stream.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/Ice/Stream.cpp	2012-03-04 20:14:53.000000000 +0100
@@ -8,10 +8,19 @@
 // **********************************************************************
 
 #include <Ice/Stream.h>
+#include <Ice/LocalException.h>
 
 using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
-IceUtil::Shared* IceInternal::upCast(InputStream* p) { return p; }
-IceUtil::Shared* IceInternal::upCast(OutputStream* p) { return p; }
+IceUtil::Shared* Ice::upCast(InputStream* p) { return p; }
+IceUtil::Shared* Ice::upCast(OutputStream* p) { return p; }
+
+namespace IceInternal
+{
+  void delegateThrowMarshalException(const char* file, int line , const ::std::string& message)
+  {
+    throw Ice::MarshalException(file, line, message);
+  }
+}




--- cpp.orig/src/IceGrid/AdminCallbackRouter.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/IceGrid/AdminCallbackRouter.cpp	2012-03-04 20:14:53.000000000 +0100
@@ -49,7 +49,12 @@
 #ifndef NDEBUG
     bool inserted =
 #endif
-        _categoryToConnection.insert(map<string, ConnectionPtr>::value_type(category, con)).second;
+        _categoryToConnection.insert(map<string, ConnectionPtr>::value_type(category, con))
+#ifndef NDEBUG
+        .second
+#endif
+        ;
+
     
     assert(inserted == true);
 }




--- cpp.orig/src/IceGrid/DescriptorHelper.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/IceGrid/DescriptorHelper.cpp	2012-03-04 20:14:53.000000000 +0100
@@ -198,15 +198,6 @@
     return result;
 }
 
-template<typename Dict> Dict
-getDictUpdatedElts(const Dict& ldict, const Dict& rdict)
-{
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
-    return getDictUpdatedEltsWithEq(ldict, rdict, equal_to<Dict::mapped_type>());
-#else
-    return getDictUpdatedEltsWithEq(ldict, rdict, equal_to<typename Dict::mapped_type>());
-#endif
-}
 
 template<typename EqFunc, typename Dict> Dict
 getDictUpdatedEltsWithEq(const Dict& ldict, const Dict& rdict, EqFunc eq)
@@ -223,6 +214,16 @@
     return result;
 }
 
+template<typename Dict> Dict
+getDictUpdatedElts(const Dict& ldict, const Dict& rdict)
+{
+#if defined(_MSC_VER) && (_MSC_VER < 1300)
+    return getDictUpdatedEltsWithEq(ldict, rdict, equal_to<Dict::mapped_type>());
+#else
+    return getDictUpdatedEltsWithEq(ldict, rdict, equal_to<typename Dict::mapped_type>());
+#endif
+}
+
 template <typename Dict> Ice::StringSeq
 getDictRemovedElts(const Dict& ldict, const Dict& rdict)
 {




--- cpp.orig/src/IceGrid/Internal.ice	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/IceGrid/Internal.ice	2012-03-04 19:55:44.000000000 +0100
@@ -702,7 +702,7 @@
      *
      **/
     NodeSession* registerNode(InternalNodeInfo info, Node* prx, LoadInfo loadInf)
-        throws NodeActiveException;
+        throws NodeActiveException, PermissionDeniedException;
 
     /**
      *
@@ -721,7 +721,7 @@
      *
      **/
     ReplicaSession* registerReplica(InternalReplicaInfo info, InternalRegistry* prx)
-        throws ReplicaActiveException;
+        throws ReplicaActiveException, PermissionDeniedException;
 
     /**
      *




--- cpp.orig/src/IceGrid/InternalRegistryI.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/IceGrid/InternalRegistryI.cpp	2012-03-04 19:55:44.000000000 +0100
@@ -19,6 +19,8 @@
 #include <IceGrid/ReplicaSessionI.h>
 #include <IceGrid/ReplicaSessionManager.h>
 #include <IceGrid/FileCache.h>
+#include <IceSSL/IceSSL.h>
+#include <IceSSL/RFC2253.h>
 
 using namespace std;
 using namespace IceGrid;
@@ -38,6 +40,8 @@
     Ice::PropertiesPtr properties = database->getCommunicator()->getProperties();
     _nodeSessionTimeout = properties->getPropertyAsIntWithDefault("IceGrid.Registry.NodeSessionTimeout", 30);
     _replicaSessionTimeout = properties->getPropertyAsIntWithDefault("IceGrid.Registry.ReplicaSessionTimeout", 30);
+    _requireNodeCertCN = properties->getPropertyAsIntWithDefault("IceGrid.Registry.RequireNodeCertCN", 0);
+    _requireReplicaCertCN = properties->getPropertyAsIntWithDefault("IceGrid.Registry.RequireReplicaCertCN", 0);
 }
 
 InternalRegistryI::~InternalRegistryI()
@@ -50,7 +54,56 @@
                                 const LoadInfo& load, 
                                 const Ice::Current& current)
 {
-    const Ice::LoggerPtr logger = _database->getTraceLevels()->logger;
+    const TraceLevelsPtr traceLevels = _database->getTraceLevels();
+    const Ice::LoggerPtr logger = traceLevels->logger;
+    if(!info || !node)
+    {
+        return 0;
+    }
+
+    if(_requireNodeCertCN)
+    {
+        try
+        {
+            IceSSL::ConnectionInfoPtr sslConnInfo = IceSSL::ConnectionInfoPtr::dynamicCast(current.con->getInfo());
+            if(sslConnInfo)
+            {
+                if (sslConnInfo->certs.empty() ||
+                    !IceSSL::Certificate::decode(sslConnInfo->certs[0])->getSubjectDN().match("CN=" + info->name))
+                {
+                    if(traceLevels->node > 0)
+                    {
+                        Ice::Trace out(logger, traceLevels->nodeCat);
+                        out << "certificate CN doesn't match node name `" << info->name << "'";
+                    }
+                    throw PermissionDeniedException("certificate CN doesn't match node name `" + info->name + "'");
+                }
+            }
+            else
+            {
+                if(traceLevels->node > 0)
+                {
+                    Ice::Trace out(logger, traceLevels->nodeCat);
+                    out << "node certificate for `" << info->name << "' is required to connect to this registry";
+                }
+                throw PermissionDeniedException("node certificate is required to connect to this registry");
+            }
+        }
+        catch(const PermissionDeniedException& ex)
+        {
+            throw ex;
+        }
+        catch(const IceUtil::Exception&)
+        {
+            if(traceLevels->node > 0)
+            {
+                Ice::Trace out(logger, traceLevels->nodeCat);
+                out << "unexpected exception while verifying certificate for node `" << info->name << "'";
+            }
+            throw PermissionDeniedException("unable to verify certificate for node `" + info->name + "'");
+        }
+    }
+ 
     try
     {
         NodeSessionIPtr session = new NodeSessionI(_database, node, info, _nodeSessionTimeout, load);
@@ -68,7 +121,56 @@
                                    const InternalRegistryPrx& prx,
                                    const Ice::Current& current)
 {
-    const Ice::LoggerPtr logger = _database->getTraceLevels()->logger;
+    const TraceLevelsPtr traceLevels = _database->getTraceLevels();
+    const Ice::LoggerPtr logger = traceLevels->logger;
+    if(!info || !prx)
+    {
+        return 0;
+    }
+
+    if(_requireReplicaCertCN)
+    {
+        try
+        {
+            IceSSL::ConnectionInfoPtr sslConnInfo = IceSSL::ConnectionInfoPtr::dynamicCast(current.con->getInfo());
+            if(sslConnInfo)
+            {
+                if (sslConnInfo->certs.empty() ||
+                    !IceSSL::Certificate::decode(sslConnInfo->certs[0])->getSubjectDN().match("CN=" + info->name))
+                {
+                    if(traceLevels->replica > 0)
+                    {
+                        Ice::Trace out(logger, traceLevels->replicaCat);
+                        out << "certificate CN doesn't match replica name `" << info->name << "'";
+                    }
+                    throw PermissionDeniedException("certificate CN doesn't match replica name `" + info->name + "'");
+                }
+            }
+            else
+            {
+                if(traceLevels->replica > 0)
+                {
+                    Ice::Trace out(logger, traceLevels->replicaCat);
+                    out << "replica certificate for `" << info->name << "' is required to connect to this registry";
+                }
+                throw PermissionDeniedException("replica certificate is required to connect to this registry");
+            }
+        }
+        catch(const PermissionDeniedException& ex)
+        {
+            throw ex;
+        }
+        catch(const IceUtil::Exception&)
+        {
+            if(traceLevels->replica > 0)
+            {
+                Ice::Trace out(logger, traceLevels->replicaCat);
+                out << "unexpected exception while verifying certificate for replica `" << info->name << "'";
+            }
+            throw PermissionDeniedException("unable to verify certificate for replica `" + info->name + "'");
+        }
+    }
+    
     try
     {
         ReplicaSessionIPtr s = new ReplicaSessionI(_database, _wellKnownObjects, info, prx, _replicaSessionTimeout);

Line 0 Link Here

(-)files/patch-cpp-src-IceGrid-InternalRegistryI.h (+11 lines)
	1	--- cpp.orig/src/IceGrid/InternalRegistryI.h 2011-06-15 21:43:59.000000000 +0200
	2	+++ cpp/src/IceGrid/InternalRegistryI.h 2012-03-04 19:55:44.000000000 +0100
	3	@@ -68,6 +68,8 @@
	4	ReplicaSessionManager& _session;
	5	int _nodeSessionTimeout;
	6	int _replicaSessionTimeout;
	7	+ bool _requireNodeCertCN;
	8	+ bool _requireReplicaCertCN;
	9	};
	10
	11	};




--- cpp.orig/src/IceGrid/NodeSessionManager.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/IceGrid/NodeSessionManager.cpp	2012-03-04 19:55:44.000000000 +0100
@@ -110,6 +110,14 @@
         }
         exception.reset(ex.ice_clone());
     }
+    catch(const PermissionDeniedException& ex)
+    {
+        if(traceLevels)
+        { 
+            traceLevels->logger->error("connection to the the registry `" + _name + "' was denied:\n" + ex.reason);
+        }
+        exception.reset(ex.ice_clone());
+    }
     catch(const Ice::Exception& ex)
     {
         exception.reset(ex.ice_clone());

Line 0 Link Here

(-)files/patch-cpp-src-IceGrid-ReplicaCache.cpp (+11 lines)
	1	--- cpp.orig/src/IceGrid/ReplicaCache.cpp 2011-06-15 21:43:59.000000000 +0200
	2	+++ cpp/src/IceGrid/ReplicaCache.cpp 2012-03-04 20:14:53.000000000 +0100
	3	@@ -40,7 +40,7 @@
	4	Lock sync(*this);
	5
	6	ReplicaEntryPtr entry;
	7	- while(entry = getImpl(name))
	8	+ while((entry = getImpl(name)))
	9	{
	10	ReplicaSessionIPtr session = entry->getSession();
	11	if(session->isDestroyed())




--- cpp.orig/src/IceGrid/ReplicaSessionManager.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/IceGrid/ReplicaSessionManager.cpp	2012-03-04 19:55:44.000000000 +0100
@@ -500,6 +500,14 @@
         }
         exception.reset(ex.ice_clone());
     }
+    catch(const PermissionDeniedException& ex)
+    {
+        if(_traceLevels)
+        {
+            _traceLevels->logger->error("connection to the the registry `" + _name + "' was denied:\n" + ex.reason);
+        }
+        exception.reset(ex.ice_clone());
+    }
     catch(const Ice::Exception& ex)
     {
         exception.reset(ex.ice_clone());

Line 0 Link Here

(-)files/patch-cpp-src-IceGrid-SessionI.h (+11 lines)
	1	--- cpp.orig/src/IceGrid/SessionI.h 2011-06-15 21:43:59.000000000 +0200
	2	+++ cpp/src/IceGrid/SessionI.h 2012-03-04 20:14:53.000000000 +0100
	3	@@ -35,7 +35,7 @@
	4	class SessionI;
	5	typedef IceUtil::Handle<SessionI> SessionIPtr;
	6
	7	-class BaseSessionI : virtual Ice::Object, public IceUtil::Mutex
	8	+class BaseSessionI : virtual public Ice::Object, public IceUtil::Mutex
	9	{
	10	public:
	11

Line 0 Link Here

(-)files/patch-cpp-src-IceSSL-Instance.cpp (+11 lines)
	1	--- cpp.orig/src/IceSSL/Instance.cpp 2011-06-15 21:43:59.000000000 +0200
	2	+++ cpp/src/IceSSL/Instance.cpp 2012-03-04 20:14:53.000000000 +0100
	3	@@ -38,7 +38,7 @@
	4	using namespace Ice;
	5	using namespace IceSSL;
	6
	7	-IceUtil::Shared* IceInternal::upCast(IceSSL::Instance* p) { return p; }
	8	+IceUtil::Shared* IceSSL::upCast(IceSSL::Instance* p) { return p; }
	9
	10	namespace
	11	{




--- cpp.orig/src/IceSSL/InstanceF.h	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/IceSSL/InstanceF.h	2012-03-04 20:14:53.000000000 +0100
@@ -18,13 +18,13 @@
 {
 
 class Instance;
+IceUtil::Shared* upCast(IceSSL::Instance*);
 
 }
 
 namespace IceInternal
 {
 
-IceUtil::Shared* upCast(IceSSL::Instance*);
 
 }
 

Line 0 Link Here

(-)files/patch-cpp-src-IceSSL-TrustManager.cpp (+11 lines)
	1	--- cpp.orig/src/IceSSL/TrustManager.cpp 2011-06-15 21:43:59.000000000 +0200
	2	+++ cpp/src/IceSSL/TrustManager.cpp 2012-03-04 20:14:53.000000000 +0100
	3	@@ -20,7 +20,7 @@
	4	using namespace std;
	5	using namespace IceSSL;
	6
	7	-IceUtil::Shared* IceInternal::upCast(IceSSL::TrustManager* p) { return p; }
	8	+IceUtil::Shared* IceSSL::upCast(IceSSL::TrustManager* p) { return p; }
	9
	10	TrustManager::TrustManager(const Ice::CommunicatorPtr& communicator) :
	11	_communicator(communicator)




--- cpp.orig/src/IceSSL/TrustManagerF.h	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/IceSSL/TrustManagerF.h	2012-03-04 20:14:53.000000000 +0100
@@ -18,13 +18,13 @@
 {
 
 class TrustManager;
+IceUtil::Shared* upCast(IceSSL::TrustManager*);
 
 }
 
 namespace IceInternal
 {
 
-IceUtil::Shared* upCast(IceSSL::TrustManager*);
 
 }
 

Line 0 Link Here

(-)files/patch-cpp-src-IceSSL-Util.cpp (+11 lines)
	1	--- cpp.orig/src/IceSSL/Util.cpp 2011-06-15 21:43:59.000000000 +0200
	2	+++ cpp/src/IceSSL/Util.cpp 2012-03-04 20:14:53.000000000 +0100
	3	@@ -175,7 +175,7 @@
	4	return dh;
	5	}
	6
	7	-IceUtil::Shared* IceInternal::upCast(IceSSL::DHParams* p) { return p; }
	8	+IceUtil::Shared* IceSSL::upCast(IceSSL::DHParams* p) { return p; }
	9
	10	IceSSL::DHParams::DHParams() :
	11	_dh512(0), _dh1024(0), _dh2048(0), _dh4096(0)




--- cpp.orig/src/IceSSL/UtilF.h	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/IceSSL/UtilF.h	2012-03-04 20:14:53.000000000 +0100
@@ -21,13 +21,13 @@
 {
 
 class DHParams;
+IceUtil::Shared* upCast(IceSSL::DHParams*);
 
 }
 
 namespace IceInternal
 {
 
-IceUtil::Shared* upCast(IceSSL::DHParams*);
 
 }
 




--- cpp.orig/src/IceStorm/NodeI.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/IceStorm/NodeI.cpp	2012-03-04 20:14:53.000000000 +0100
@@ -18,11 +18,6 @@
 namespace
 {
 
-bool operator==(const GroupNodeInfo& info, int id)
-{
-    return info.id == id;
-}
-
 class CheckTask : public IceUtil::TimerTask
 {
     const NodeIPtr _node;

Line 0 Link Here

(-)files/patch-cpp-src-IceUtil-Cond.cpp (+15 lines)
	1	--- cpp.orig/src/IceUtil/Cond.cpp 2011-06-15 21:43:59.000000000 +0200
	2	+++ cpp/src/IceUtil/Cond.cpp 2012-03-04 20:14:53.000000000 +0100
	3	@@ -330,8 +330,11 @@
	4
	5	IceUtil::Cond::~Cond()
	6	{
	7	+#ifndef NDEBUG
	8	int rc = 0;
	9	- rc = pthread_cond_destroy(&_cond);
	10	+ rc =
	11	+#endif
	12	+ pthread_cond_destroy(&_cond);
	13	assert(rc == 0);
	14	}
	15




--- cpp.orig/src/IceUtil/CountDownLatch.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/IceUtil/CountDownLatch.cpp	2012-03-04 20:14:53.000000000 +0100
@@ -44,10 +44,16 @@
 #ifdef _WIN32
     CloseHandle(_event);
 #else
+#ifndef NDEBUG
     int rc = 0;
-    rc = pthread_mutex_destroy(&_mutex);
+    rc = 
+#endif
+    pthread_mutex_destroy(&_mutex);
     assert(rc == 0);
-    rc = pthread_cond_destroy(&_cond);
+#ifndef NDEBUG
+    rc = 
+#endif
+    pthread_cond_destroy(&_cond);
     assert(rc == 0);
 #endif
 }




--- cpp.orig/src/IceUtil/CtrlCHandler.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/IceUtil/CtrlCHandler.cpp	2012-03-04 20:14:53.000000000 +0100
@@ -219,29 +219,41 @@
         sigaddset(&ctrlCLikeSignals, SIGHUP);
         sigaddset(&ctrlCLikeSignals, SIGINT);
         sigaddset(&ctrlCLikeSignals, SIGTERM);
-        int rc = pthread_sigmask(SIG_BLOCK, &ctrlCLikeSignals, 0);
+#ifndef NDEBUG
+        int rc = 
+#endif        
+        pthread_sigmask(SIG_BLOCK, &ctrlCLikeSignals, 0);
         assert(rc == 0);
 
         // Joinable thread
-        rc = pthread_create(&_tid, 0, sigwaitThread, 0);
+#ifndef NDEBUG
+        rc = 
+#endif
+        pthread_create(&_tid, 0, sigwaitThread, 0);
         assert(rc == 0);
     }
 }
 
 CtrlCHandler::~CtrlCHandler()
 {
-    int rc = pthread_cancel(_tid);
+#ifndef NDEBUG
+    int rc = 
+#endif
+    pthread_cancel(_tid);
     assert(rc == 0);
 #if defined(__APPLE__)
     //
     // WORKAROUND: sigwait isn't a cancellation point on MacOS X, see
     // comment in sigwaitThread
     //
-    rc = pthread_kill(_tid, SIGTERM);
+    pthread_kill(_tid, SIGTERM);
     //assert(rc == 0); For some reaosns, this assert is sometime triggered
 #endif
     void* status = 0;
-    rc = pthread_join(_tid, &status);
+#ifndef NDEBUG
+    rc = 
+#endif
+    pthread_join(_tid, &status);
     assert(rc == 0);
 #if !defined(__APPLE__)
     assert(status == PTHREAD_CANCELED);




--- cpp.orig/src/IceUtil/FileUtil.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/IceUtil/FileUtil.cpp	2012-03-04 20:14:53.000000000 +0100
@@ -26,6 +26,10 @@
 #  include <dir.h>
 #endif
 
+#ifdef __FreeBSD__
+#  include <unistd.h>
+#endif
+
 using namespace std;
 
 //




--- cpp.orig/src/IceUtil/RecMutex.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/IceUtil/RecMutex.cpp	2012-03-04 20:14:53.000000000 +0100
@@ -148,8 +148,11 @@
 IceUtil::RecMutex::~RecMutex()
 {
     assert(_count == 0);
+#ifndef NDEBUG
     int rc = 0;
-    rc = pthread_mutex_destroy(&_mutex);
+    rc = 
+#endif
+    pthread_mutex_destroy(&_mutex);
     assert(rc == 0);
 }
 
@@ -196,8 +199,11 @@
 {
     if(--_count == 0)
     {
+#ifndef NDEBUG
         int rc = 0; // Prevent warnings when NDEBUG is defined.
-        rc = pthread_mutex_unlock(&_mutex);
+        rc = 
+#endif
+        pthread_mutex_unlock(&_mutex);
         assert(rc == 0);
     }
 }




--- cpp.orig/src/Slice/CPlusPlusUtil.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/Slice/CPlusPlusUtil.cpp	2012-03-04 20:14:53.000000000 +0100
@@ -631,7 +631,7 @@
         string scope = fixKwd(cl->scope());
         if(marshal)
         {
-            out << nl << stream << deref << "write(::Ice::ObjectPtr(::IceInternal::upCast(" << fixedParam 
+            out << nl << stream << deref << "write(::Ice::ObjectPtr(" << scope << "upCast(" << fixedParam 
                 << ".get())));";
         }
         else
@@ -649,7 +649,7 @@
         string scope = fixKwd(px->_class()->scope());
         if(marshal)
         {
-            out << nl << stream << deref << "write(::Ice::ObjectPrx(::IceInternal::upCast(" << fixedParam 
+            out << nl << stream << deref << "write(::Ice::ObjectPrx(::IceProxy" << scope << "upCast(" << fixedParam 
                 << ".get())));";
         }
         else




--- cpp.orig/src/Slice/FileTracker.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/Slice/FileTracker.cpp	2012-03-04 20:14:53.000000000 +0100
@@ -17,6 +17,10 @@
 #   include <direct.h>
 #endif
 
+#ifdef __FreeBSD__
+#   include <unistd.h>
+#endif
+
 using namespace std;
 
 Slice::FileException::FileException(const char* file, int line, const string& r) :




--- cpp.orig/src/slice2cpp/Gen.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/slice2cpp/Gen.cpp	2012-03-04 20:14:53.000000000 +0100
@@ -1944,8 +1944,10 @@
     }
 
     string name = fixKwd(p->name());
+    string scoped = fixKwd(p->scoped());
 
     H << sp << nl << "class " << name << ';';
+    H << nl << _dllExport << "::IceProxy::Ice::Object* upCast(::IceProxy" << scoped << "*);";
 }
 
 Slice::Gen::ProxyVisitor::ProxyVisitor(Output& h, Output& c, const string& dllExport) :
@@ -3691,10 +3693,22 @@
 Slice::Gen::ObjectDeclVisitor::visitClassDecl(const ClassDeclPtr& p)
 {
     string name = fixKwd(p->name());
+    string scoped = fixKwd(p->scoped());
 
     H << sp << nl << "class " << name << ';';
     H << nl << "bool operator==(const " << name << "&, const " << name << "&);";
     H << nl << "bool operator<(const " << name << "&, const " << name << "&);";
+
+    H << sp;
+
+    if(!p->isLocal())
+    {
+        H << nl << _dllExport << "::Ice::Object* upCast(" << scoped << "*);";
+    }
+    else
+    {
+        H << nl << _dllExport << "::Ice::LocalObject* upCast(" << scoped << "*);";
+    }
 }
 
 void
@@ -4922,13 +4936,13 @@
 {
     if((BuiltinPtr::dynamicCast(p) && BuiltinPtr::dynamicCast(p)->kind() == Builtin::KindObject)
        || ClassDeclPtr::dynamicCast(p))
-    {
-        C << nl << "if(" << prefix << name << ')';
+    {        C << nl << "if(" << prefix << name << ')';
         C << sb;
         ClassDeclPtr decl = ClassDeclPtr::dynamicCast(p);
         if(decl)
         {
-            C << nl << "::IceInternal::upCast(" << prefix << name << ".get())->__addObject(_c);";
+            string scope = fixKwd(decl->scope());
+            C << nl << scope << "upCast(" << prefix << name << ".get())->__addObject(_c);";
         }
         else
         {
@@ -4991,9 +5005,10 @@
         ClassDeclPtr decl = ClassDeclPtr::dynamicCast(p);
         if(decl)
         {
-            C << nl << "if(" << "::IceInternal::upCast(" << prefix << name << ".get())->__usesClasses())";
+            string scope = fixKwd(decl->scope());
+            C << nl << "if(" << scope << "upCast(" << prefix << name << ".get())->__usesClasses())";
             C << sb;
-            C << nl << "::IceInternal::upCast(" << prefix << name << ".get())->__decRefUnsafe();";
+            C << nl << scope << "upCast(" << prefix << name << ".get())->__decRefUnsafe();";
             C << nl << prefix << name << ".__clearHandleUnsafe();";
 
         }
@@ -5629,40 +5644,30 @@
 {
     string scoped = fixKwd(p->scoped());
 
-    H << sp;
-
-    if(!p->isLocal())
-    {
-        H << nl << _dllExport << "::Ice::Object* upCast(" << scoped << "*);";
-        H << nl << _dllExport << "::IceProxy::Ice::Object* upCast(::IceProxy" << scoped << "*);";
-    }
-    else
-    {
-        H << nl << _dllExport << "::Ice::LocalObject* upCast(" << scoped << "*);";
-    }
 }
 
 bool
 Slice::Gen::IceInternalVisitor::visitClassDefStart(const ClassDefPtr& p)
 {
     string scoped = fixKwd(p->scoped());
+    string scope = fixKwd(p->scope());
 
     C << sp;
     if(!p->isLocal())
     {
         C << nl
 	  << (_dllExport.empty() ? "" : "ICE_DECLSPEC_EXPORT ")
-	  << "::Ice::Object* IceInternal::upCast(" << scoped << "* p) { return p; }";
+	  << "::Ice::Object* " << scope << "upCast(" << scoped << "* p) { return p; }";
         C << nl
 	  << (_dllExport.empty() ? "" : "ICE_DECLSPEC_EXPORT ")
-	  << "::IceProxy::Ice::Object* IceInternal::upCast(::IceProxy" << scoped
+	  << "::IceProxy::Ice::Object* IceProxy" << scope << "upCast(::IceProxy" << scoped
           << "* p) { return p; }";
     }
     else
     {
         C << nl
 	  << (_dllExport.empty() ? "" : "ICE_DECLSPEC_EXPORT ")
-	  << "::Ice::LocalObject* IceInternal::upCast(" << scoped << "* p) { return p; }";
+	  << "::Ice::LocalObject* " << scope << "upCast(" << scoped << "* p) { return p; }";
     }
 
     return true;




--- cpp.orig/src/slice2cs/Gen.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/slice2cs/Gen.cpp	2012-03-04 20:14:53.000000000 +0100
@@ -1281,7 +1281,7 @@
         {
             _out << value << "F";
         }
-        else if(ep = EnumPtr::dynamicCast(type))
+        else if((ep = EnumPtr::dynamicCast(type)))
         {
             string enumName = fixId(ep->scoped());
             string::size_type colon = value.rfind(':');
@@ -3914,16 +3914,6 @@
     ClassDefPtr cl = ClassDefPtr::dynamicCast(p->container());
     string name = fixId(p->name(), DotNet::ICloneable, true);
     vector<string> params = getParams(p);
-    bool hasOutParams = false;
-    ParamDeclList paramList = p->parameters();
-    for(ParamDeclList::const_iterator pli = paramList.begin(); pli != paramList.end(); ++pli)
-    {
-        if((*pli)->isOutParam())
-        {
-            hasOutParams = true;
-            break;
-        }
-    }
 
     _out << sp;
 




--- cpp.orig/src/slice2java/Gen.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/src/slice2java/Gen.cpp	2012-03-04 20:14:53.000000000 +0100
@@ -1246,7 +1246,7 @@
     {
         BuiltinPtr bp;
         EnumPtr ep;
-        if(bp = BuiltinPtr::dynamicCast(type))
+        if((bp = BuiltinPtr::dynamicCast(type)))
         {
             switch(bp->kind())
             {
@@ -1349,7 +1349,7 @@
             }
 
         }
-        else if(ep = EnumPtr::dynamicCast(type))
+        else if((ep = EnumPtr::dynamicCast(type)))
         {
             string val = value;
             string::size_type pos = val.rfind(':');




--- cpp.orig/test/Glacier2/ssl/Server.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/test/Glacier2/ssl/Server.cpp	2012-03-04 20:14:53.000000000 +0100
@@ -31,9 +31,15 @@
         test(ctx["_con.type"] == "ssl");
         test(ctx["_con.localPort"] == "12348");
     }
-    test(ctx["_con.localAddress"] == "127.0.0.1");
+    if (!inFreeBSDJail())
+    {
+        test(ctx["_con.localAddress"] == "127.0.0.1");
+    }
     test(ctx["_con.remotePort"] != "");
-    test(ctx["_con.remoteAddress"] == "127.0.0.1");
+    if (!inFreeBSDJail())
+    {
+        test(ctx["_con.remoteAddress"] == "127.0.0.1");
+    }
 }
 
 }
@@ -99,7 +105,7 @@
     }
 
     virtual void
-    ice_ping(const Ice::Current& current)
+    ice_ping(const Ice::Current& current) const
     {
         testContext(_ssl, current.ctx);
     }
@@ -133,8 +139,11 @@
     {
         testContext(true, current.ctx);
 
-        test(info.remoteHost == "127.0.0.1");
-        test(info.localHost == "127.0.0.1");
+        if (!inFreeBSDJail())
+        {
+            test(info.remoteHost == "127.0.0.1");
+            test(info.localHost == "127.0.0.1");
+        }
         test(info.localPort == 12348);
 
         try

Line 0 Link Here

(-)files/patch-cpp-test-Ice-background-EndpointI.h (+11 lines)
	1	--- cpp.orig/test/Ice/background/EndpointI.h 2011-06-15 21:43:59.000000000 +0200
	2	+++ cpp/test/Ice/background/EndpointI.h 2012-03-04 20:14:53.000000000 +0100
	3	@@ -48,7 +48,7 @@
	4
	5	virtual Ice::Int hashInit() const;
	6	#if !defined(_MSC_VER) \|\| _MSC_VER > 1300
	7	- using IceInternal::EndpointI::connectors;
	8	+ using ::IceInternal::EndpointI::connectors;
	9	#endif
	10
	11	private:




--- cpp.orig/test/Ice/custom/AllTests.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/test/Ice/custom/AllTests.cpp	2012-03-04 20:14:53.000000000 +0100
@@ -1384,7 +1384,8 @@
                        const ::Test::ClassStructSeq& seq,
                        const InParamPtr& cookie)
     {
-        pair< ::Test::ClassStructPtr, ::Test::ClassStructSeq> in = getIn(in, cookie);
+        pair< ::Test::ClassStructPtr, ::Test::ClassStructSeq> in;
+        in = getIn(in, cookie);
         test(ret == in.first);
         test(cs1 == in.first);
         test(seq == in.second);
@@ -1432,7 +1433,8 @@
 
     void throwExcept1(const Ice::AsyncResultPtr& result)
     {
-        wstring in = getIn(in, InParamPtr::dynamicCast(result->getCookie()));
+        wstring in;
+        in = getIn(in, InParamPtr::dynamicCast(result->getCookie()));
         try
         {
             Test1::WstringClassPrx t = Test1::WstringClassPrx::uncheckedCast(result->getProxy());
@@ -1451,7 +1453,8 @@
 
     void throwExcept2(const Ice::AsyncResultPtr& result)
     {
-        wstring in = getIn(in, InParamPtr::dynamicCast(result->getCookie()));
+        wstring in;
+        in = getIn(in, InParamPtr::dynamicCast(result->getCookie()));
         try
         {
             Test2::WstringClassPrx t = Test2::WstringClassPrx::uncheckedCast(result->getProxy());




--- cpp.orig/test/Ice/info/AllTests.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/test/Ice/info/AllTests.cpp	2012-03-04 20:14:53.000000000 +0100
@@ -141,9 +141,11 @@
         test(info->adapterName.empty());
         test(info->localPort > 0);
         test(info->remotePort == 12010);
-        test(info->remoteAddress == defaultHost);
-        test(info->localAddress == defaultHost);
-
+        if (!inFreeBSDJail())
+        {
+            test(info->remoteAddress == defaultHost);
+            test(info->localAddress == defaultHost);
+        }
         ostringstream os;
 
         Ice::Context ctx = testIntf->getConnectionInfoAsContext();
@@ -163,8 +165,11 @@
         test(info->adapterName.empty());
         test(info->localPort > 0);
         test(info->remotePort == 12010);
-        test(info->remoteAddress ==defaultHost);
-        test(info->localAddress == defaultHost);
+        if (!inFreeBSDJail())
+        {
+            test(info->remoteAddress == defaultHost);
+            test(info->localAddress == defaultHost);
+        }
     }
     cout << "ok" << endl;
 




--- cpp.orig/test/Ice/properties/run.py	2011-06-15 21:43:59.000000000 +0200
+++ cpp/test/Ice/properties/run.py	2012-03-04 20:14:53.000000000 +0100
@@ -26,7 +26,7 @@
 #
 # Write config
 #
-configPath = u"./config/中国_client.config"
+configPath = u"./config/中国_client.config".encode("utf-8")
 
 TestUtil.createConfig(configPath, 
                       ["# Automatically generated by Ice test driver.", 
@@ -38,4 +38,4 @@
 TestUtil.simpleTest(client)
 
 if os.path.exists(configPath):
-    os.remove(configPath)
\ No newline at end of file
+    os.remove(configPath)




--- cpp.orig/test/IceUtil/unicode/Client.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/test/IceUtil/unicode/Client.cpp	2012-03-04 20:14:53.000000000 +0100
@@ -15,6 +15,10 @@
 #   include <io.h>
 #endif
 
+#ifdef __FreeBSD__
+#   include <unistd.h>
+#endif
+
 using namespace IceUtil;
 using namespace std;
 




--- cpp.orig/test/Slice/keyword/Client.cpp	2011-06-15 21:43:59.000000000 +0200
+++ cpp/test/Slice/keyword/Client.cpp	2012-03-04 20:14:53.000000000 +0100
@@ -73,6 +73,9 @@
     virtual void ice_response(Ice::Int)  {}
     virtual void ice_exception(const ::Ice::Exception&) {}
 };
+
+template<typename T>
+void unused(T const &) { }
    
 //
 // This section of the test is present to ensure that the C++ types
@@ -86,6 +89,7 @@
 
     _cpp_and::_cpp_auto b;
     b._cpp_default = 0;
+    unused(b);
 
     _cpp_and::deletePtr c = new _cpp_and::_cpp_delete();
     c->_cpp_else = "";




--- cpp.orig/test/include/TestCommon.h	2011-06-15 21:43:59.000000000 +0200
+++ cpp/test/include/TestCommon.h	2012-03-04 20:14:53.000000000 +0100
@@ -17,6 +17,22 @@
 #include <stdlib.h>
 #endif
 
+#if defined(__FreeBSD__)
+#  include <sys/types.h>
+#  include <sys/sysctl.h>
+inline bool inFreeBSDJail()
+{
+    int jailed;
+    size_t size = sizeof(jailed);
+    return (sysctlbyname("security.jail.jailed", &jailed, &size, NULL, 0) != -1 || jailed);
+}
+#else
+inline bool inFreeBSDJail()
+{
+    return false;
+}
+#endif
+
 void
 inline testFailed(const char* expr, const char* file, unsigned int line)
 {




--- scripts.orig/TestUtil.py	2011-06-15 21:44:00.000000000 +0200
+++ scripts/TestUtil.py	2012-03-04 20:14:53.000000000 +0100
@@ -74,6 +74,25 @@
 def isLinux():
     return sys.platform.startswith("linux")
 
+def isFreeBSD():
+    return sys.platform.startswith("freebsd")
+
+def sysctl(key):
+    p = subprocess.Popen("sysctl "+key, shell=1, stdout=subprocess.PIPE)
+    try:
+        result = p.communicate()[0].strip().split()[1]
+    except IndexError:
+        return 0    
+    if sys.version_info >= (3,):
+        result = str(result, sys.stdout.encoding)
+    try:
+        return int(result)
+    except ValueError:
+        return result
+
+def isFreeBSDJail():
+    return isFreeBSD() and sysctl("security.jail.jailed")
+
 def getCppCompiler():
     compiler = ""
     if os.environ.get("CPP_COMPILER", "") != "":
@@ -1590,7 +1609,15 @@
             if isDarwin() and "nodarwin" in config:
                 print "%s*** test not supported under Darwin%s" % (prefix, suffix)
                 continue
+
+            if isFreeBSD() and "nofreebsd" in config:
+                print "%s*** test not supported under FreeBSD%s" % (prefix, suffix)
+                continue
             
+            if isFreeBSDJail() and "nofreebsdjail" in config:
+                print "%s*** test not supported within a FreeBSD Jail%s" % (prefix, suffix)
+                continue
+
             if not isWin32() and "win32only" in config:
                 print "%s*** test only supported under Win32%s" % (prefix, suffix)
                 continue

Return to bug 165702

Line 0 Link Here

(-)files/patch-cpp-allTests.py (+30 lines)
	1	--- cpp.orig/allTests.py 2011-06-15 21:43:58.000000000 +0200
	2	+++ cpp/allTests.py 2012-03-04 20:14:52.000000000 +0100
	3	@@ -25,6 +25,7 @@
	4	# List of all basic tests.
	5	#
	6	tests = [
	7	+
	8	("IceUtil/condvar", ["once", "win32only"]),
	9	("IceUtil/thread", ["once"]),
	10	("IceUtil/unicode", ["once"]),
	11	@@ -62,7 +63,7 @@
	12	("Ice/servantLocator", ["core"]),
	13	("Ice/interceptor", ["core"]),
	14	("Ice/stringConverter", ["core"]),
	15	- ("Ice/udp", ["core"]),
	16	+ ("Ice/udp", ["core", "nofreebsdjail"]),
	17	("Ice/defaultServant", ["core"]),
	18	("Ice/defaultValue", ["core"]),
	19	("Ice/invoke", ["core", "novc6"]),
	20	@@ -106,8 +107,8 @@
	21	#
	22	if TestUtil.isWin32() or os.getuid() == 0:
	23	tests += [
	24	- ("IceUtil/priority", ["core", "nodarwin"]),
	25	- ("Ice/threadPoolPriority", ["core", "nodarwin"])
	26	+ ("IceUtil/priority", ["core", "nodarwin", "nofreebsd"]),
	27	+ ("Ice/threadPoolPriority", ["core", "nodarwin", "nofreebsd"])
	28	]
	29
	30	if __name__ == "__main__":

Line 0 Link Here

(-)files/patch-cpp-demo-IceGrid-secure-README (+15 lines)
	1	--- cpp.orig/demo/IceGrid/secure/README 2011-06-15 21:44:00.000000000 +0200
	2	+++ cpp/demo/IceGrid/secure/README 2012-03-04 19:55:44.000000000 +0100
	3	@@ -31,9 +31,10 @@
	4	the filesystem permissions to restrict access to the certificate.
	5
	6	Once the certificates are generated, you can start the IceGrid
	7	-registry, node, and Glacier2 router:
	8	+registries, node, and Glacier2 router:
	9
	10	-$ icegridregistry --Ice.Config=config.registry
	11	+$ icegridregistry --Ice.Config=config.master
	12	+$ icegridregistry --Ice.Config=config.slave
	13	$ icegridnode --Ice.Config=config.node
	14	$ glacier2router --Ice.Config=config.glacier2
	15

Line 0 Link Here

(-)files/patch-cpp-demo-IceGrid-secure-application.xml (+13 lines)
	1	--- cpp.orig/demo/IceGrid/secure/application.xml 2011-06-15 21:43:58.000000000 +0200
	2	+++ cpp/demo/IceGrid/secure/application.xml 2012-03-04 19:55:44.000000000 +0100
	3	@@ -20,8 +20,8 @@
	4	<property name="IceSSL.DefaultDir" value="certs"/>
	5
	6	<property name="Ice.Admin.Endpoints" value="ssl -h 127.0.0.1"/>
	7	- <property name="IceSSL.TrustOnly.Client" value="CN=IceGrid Registry"/>
	8	- <property name="IceSSL.TrustOnly.Server.Ice.Admin" value="CN=IceGrid Node"/>
	9	+ <property name="IceSSL.TrustOnly.Client" value="CN=Master;CN=Slave"/>
	10	+ <property name="IceSSL.TrustOnly.Server.Ice.Admin" value="CN=Node"/>
	11	</properties>
	12
	13	<node name="Node">

Line 0 Link Here

(-)files/patch-cpp-demo-IceGrid-secure-config.master (+64 lines)
	1	--- cpp.orig/demo/IceGrid/secure/config.master 2012-03-04 19:55:44.000000000 +0100
	2	+++ cpp/demo/IceGrid/secure/config.master 2012-03-04 19:55:44.000000000 +0100
	3	@@ -0,0 +1,61 @@
	4	+#
	5	+# The IceGrid instance name.
	6	+#
	7	+IceGrid.InstanceName=DemoIceGrid
	8	+
	9	+#
	10	+# IceGrid registry configuration.
	11	+#
	12	+IceGrid.Registry.Client.Endpoints=tcp -p 4061 -t 10000:ssl -p 4062 -t 10000
	13	+IceGrid.Registry.Server.Endpoints=ssl -t 10000
	14	+IceGrid.Registry.Internal.Endpoints=ssl -t 10000
	15	+IceGrid.Registry.Data=db/master
	16	+
	17	+#
	18	+# Ensure that nodes and slaves connecting to this registry have a name
	19	+# matching the certificate CN.
	20	+#
	21	+IceGrid.Registry.RequireNodeCertCN=1
	22	+IceGrid.Registry.RequireReplicaCertCN=1
	23	+
	24	+#
	25	+# IceGrid admin clients must use a secure connection to connect to the
	26	+# registry or use Glacier2.
	27	+#
	28	+IceGrid.Registry.AdminSessionManager.Endpoints=ssl -t 10000
	29	+IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
	30	+
	31	+#
	32	+# IceGrid SQL configuration if using SQL database.
	33	+#
	34	+#Ice.Plugin.DB=IceGridSqlDB:createSqlDB
	35	+#IceGrid.SQL.DatabaseType=QSQLITE
	36	+#IceGrid.SQL.DatabaseName=db/master/Registry.db
	37	+
	38	+#
	39	+# Trace properties.
	40	+#
	41	+Ice.ProgramName=Master
	42	+IceGrid.Registry.Trace.Node=2
	43	+IceGrid.Registry.Trace.Replica=2
	44	+
	45	+#
	46	+# SSL Configuration
	47	+#
	48	+Ice.Plugin.IceSSL=IceSSL:createIceSSL
	49	+IceSSL.DefaultDir=certs
	50	+IceSSL.CertAuthFile=ca_cert.pem
	51	+IceSSL.CertFile=master_cert.pem
	52	+IceSSL.KeyFile=master_key.pem
	53	+
	54	+#
	55	+# Don't require certificates. This is useful for admin clients that don't
	56	+# use certificate but still need to establish a secure connection for the
	57	+# username/password authentication
	58	+#
	59	+IceSSL.VerifyPeer=1
	60	+
	61	+IceSSL.TrustOnly.Client=CN="Master";CN="Slave";CN="Node";CN="Glacier2"
	62	+IceSSL.TrustOnly.Server.IceGrid.Registry.Server=CN="Server"
	63	+IceSSL.TrustOnly.Server.IceGrid.Registry.Internal=CN="Node";CN="Master";CN="Slave"
	64	+IceSSL.TrustOnly.Server.IceGrid.Registry.AdminSessionManager=CN="Glacier2"

Line 0 Link Here

(-)files/patch-cpp-demo-IceGrid-secure-config.node (+19 lines)
	1	--- cpp.orig/demo/IceGrid/secure/config.node 2011-06-15 21:43:58.000000000 +0200
	2	+++ cpp/demo/IceGrid/secure/config.node 2012-03-04 19:55:44.000000000 +0100
	3	@@ -1,7 +1,7 @@
	4	#
	5	# The IceGrid locator proxy.
	6	#
	7	-Ice.Default.Locator=DemoIceGrid/Locator:ssl -p 4062 -t 10000
	8	+Ice.Default.Locator=DemoIceGrid/Locator:ssl -p 4062 -t 10000:ssl -p 14062 -t 10000
	9
	10	#
	11	# IceGrid node configuration.
	12	@@ -26,5 +26,5 @@
	13	IceSSL.CertFile=node_cert.pem
	14	IceSSL.KeyFile=node_key.pem
	15
	16	-IceSSL.TrustOnly.Client=CN="Server";CN="IceGrid Registry"
	17	-IceSSL.TrustOnly.Server=CN="IceGrid Registry"
	18	+IceSSL.TrustOnly.Client=CN="Server";CN="Master";CN="Slave"
	19	+IceSSL.TrustOnly.Server=CN="Master";CN="Slave"

Line 0 Link Here

(-)files/patch-cpp-demo-IceGrid-secure-config.registry (+57 lines)
	1	--- cpp.orig/demo/IceGrid/secure/config.registry 2011-06-15 21:43:58.000000000 +0200
	2	+++ cpp/demo/IceGrid/secure/config.registry 2012-03-04 19:55:44.000000000 +0100
	3	@@ -1,54 +0,0 @@
	4	-#
	5	-# The IceGrid instance name.
	6	-#
	7	-IceGrid.InstanceName=DemoIceGrid
	8	-
	9	-#
	10	-# IceGrid registry configuration.
	11	-#
	12	-IceGrid.Registry.Client.Endpoints=tcp -p 4061 -t 10000:ssl -p 4062 -t 10000
	13	-IceGrid.Registry.Server.Endpoints=ssl -t 10000
	14	-IceGrid.Registry.Internal.Endpoints=ssl -t 10000
	15	-IceGrid.Registry.Data=db/registry
	16	-
	17	-#
	18	-# IceGrid admin clients must use a secure connection to connect to the
	19	-# registry or use Glacier2.
	20	-#
	21	-IceGrid.Registry.AdminSessionManager.Endpoints=ssl -t 10000
	22	-IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
	23	-
	24	-#
	25	-# IceGrid SQL configuration if using SQL database.
	26	-#
	27	-#Ice.Plugin.DB=IceGridSqlDB:createSqlDB
	28	-#IceGrid.SQL.DatabaseType=QSQLITE
	29	-#IceGrid.SQL.DatabaseName=db/registry/Registry.db
	30	-
	31	-#
	32	-# Trace properties.
	33	-#
	34	-Ice.ProgramName=Registry
	35	-IceGrid.Registry.Trace.Node=2
	36	-IceGrid.Registry.Trace.Replica=2
	37	-
	38	-#
	39	-# SSL Configuration
	40	-#
	41	-Ice.Plugin.IceSSL=IceSSL:createIceSSL
	42	-IceSSL.DefaultDir=certs
	43	-IceSSL.CertAuthFile=ca_cert.pem
	44	-IceSSL.CertFile=registry_cert.pem
	45	-IceSSL.KeyFile=registry_key.pem
	46	-
	47	-#
	48	-# Don't require certificates. This is useful for admin clients that don't
	49	-# use certificate but still need to establish a secure connection for the
	50	-# username/password authentication
	51	-#
	52	-IceSSL.VerifyPeer=1
	53	-
	54	-IceSSL.TrustOnly.Client=CN="IceGrid Registry";CN="IceGrid Node";CN="Glacier2"
	55	-IceSSL.TrustOnly.Server.IceGrid.Registry.Server=CN="Server"
	56	-IceSSL.TrustOnly.Server.IceGrid.Registry.Internal=CN="IceGrid Node";CN="IceGrid Registry"
	57	-IceSSL.TrustOnly.Server.IceGrid.Registry.AdminSessionManager=CN="Glacier2"

Line 0 Link Here

(-)files/patch-cpp-demo-IceGrid-secure-config.slave (+69 lines)
		1	--- cpp.orig/demo/IceGrid/secure/config.slave 2012-03-04 19:55:44.000000000 +0100
		2	+++ cpp/demo/IceGrid/secure/config.slave 2012-03-04 19:55:44.000000000 +0100
		3	@@ -0,0 +1,66 @@
		4	+#
		5	+# The IceGrid locator proxy.
		6	+#
		7	+Ice.Default.Locator=DemoIceGrid/Locator:ssl -p 4062 -t 10000
		8	+
		9	+#
		10	+# The IceGrid instance name.
		11	+#
		12	+IceGrid.InstanceName=DemoIceGrid
		13	+
		14	+#
		15	+# IceGrid registry configuration.
		16	+#
		17	+IceGrid.Registry.Client.Endpoints=tcp -p 14061 -t 10000:ssl -p 14062 -t 10000
		18	+IceGrid.Registry.Server.Endpoints=ssl -t 10000
		19	+IceGrid.Registry.Internal.Endpoints=ssl -t 10000
		20	+IceGrid.Registry.Data=db/slave
		21	+IceGrid.Registry.ReplicaName=Slave
		22	+
		23	+#
		24	+# Ensure that nodes connecting to this registry have a name matching
		25	+# the certificate CN.
		26	+#
		27	+IceGrid.Registry.RequireNodeCertCN=1
		28	+
		29	+#
		30	+# IceGrid admin clients must use a secure connection to connect to the
		31	+# registry or use Glacier2.
		32	+#
		33	+IceGrid.Registry.AdminSessionManager.Endpoints=ssl -t 10000
		34	+IceGrid.Registry.AdminPermissionsVerifier=DemoIceGrid/NullPermissionsVerifier
		35	+
		36	+#
		37	+# IceGrid SQL configuration if using SQL database.
		38	+#
		39	+#Ice.Plugin.DB=IceGridSqlDB:createSqlDB
		40	+#IceGrid.SQL.DatabaseType=QSQLITE
		41	+#IceGrid.SQL.DatabaseName=db/slave/Registry.db
		42	+
		43	+#
		44	+# Trace properties.
		45	+#
		46	+Ice.ProgramName=Slave
		47	+IceGrid.Registry.Trace.Node=2
		48	+IceGrid.Registry.Trace.Replica=2
		49	+
		50	+#
		51	+# SSL Configuration
		52	+#
		53	+Ice.Plugin.IceSSL=IceSSL:createIceSSL
		54	+IceSSL.DefaultDir=certs
		55	+IceSSL.CertAuthFile=ca_cert.pem
		56	+IceSSL.CertFile=slave_cert.pem
		57	+IceSSL.KeyFile=slave_key.pem
		58	+
		59	+#
		60	+# Don't require certificates. This is useful for admin clients that don't
		61	+# use certificate but still need to establish a secure connection for the
		62	+# username/password authentication
		63	+#
		64	+IceSSL.VerifyPeer=1
65	+
66	+IceSSL.TrustOnly.Client=CN="Master";CN="Slave";CN="Node";CN="Glacier2"
67	+IceSSL.TrustOnly.Server.IceGrid.Registry.Server=CN="Server"
68	+IceSSL.TrustOnly.Server.IceGrid.Registry.Internal=CN="Node";CN="Master";CN="Slave"
69	+IceSSL.TrustOnly.Server.IceGrid.Registry.AdminSessionManager=CN="Glacier2"

Line 0 Link Here

(-)files/patch-cpp-demo-IceGrid-secure-makecerts.py (+14 lines)
	1	--- cpp.orig/demo/IceGrid/secure/makecerts.py 2011-06-15 21:43:58.000000000 +0200
	2	+++ cpp/demo/IceGrid/secure/makecerts.py 2012-03-04 19:55:44.000000000 +0100
	3	@@ -44,8 +44,9 @@
	4	print
	5	print
	6
	7	-createCertificate("registry", "IceGrid Registry")
	8	-createCertificate("node", "IceGrid Node")
	9	+createCertificate("master", "Master")
	10	+createCertificate("slave", "Slave")
	11	+createCertificate("node", "Node")
	12	createCertificate("glacier2", "Glacier2")
	13	createCertificate("server", "Server")
	14

Line 0 Link Here

(-)files/patch-cpp-include-Ice-ConnectionIF.h (+17 lines)
	1	--- cpp.orig/include/Ice/ConnectionIF.h 2011-06-15 21:43:58.000000000 +0200
	2	+++ cpp/include/Ice/ConnectionIF.h 2012-03-04 20:14:52.000000000 +0100
	3	@@ -17,13 +17,13 @@
	4	{
	5
	6	class ConnectionI;
	7	+ICE_API Ice::LocalObject* upCast(Ice::ConnectionI*);
	8
	9	}
	10
	11	namespace IceInternal
	12	{
	13
	14	-ICE_API Ice::LocalObject* upCast(Ice::ConnectionI*);
	15
	16	enum AsyncStatus
	17	{

Line 0 Link Here

(-)files/patch-cpp-include-Ice-IconvStringConverter.h (+21 lines)
	1	--- cpp.orig/include/Ice/IconvStringConverter.h 2011-06-15 21:43:58.000000000 +0200
	2	+++ cpp/include/Ice/IconvStringConverter.h 2012-03-04 20:14:52.000000000 +0100
	3	@@ -225,10 +225,16 @@
	4	template<typename charT> /static/ void
	5	IconvStringConverter<charT>::close(std::pair<iconv_t, iconv_t> cdp)
	6	{
	7	- int rs = iconv_close(cdp.first);
	8	+#ifndef NDEBUG
	9	+ int rs =
	10	+#endif
	11	+ iconv_close(cdp.first);
	12	assert(rs == 0);
	13
	14	- rs = iconv_close(cdp.second);
	15	+#ifndef NDEBUG
	16	+ rs =
	17	+#endif
	18	+ iconv_close(cdp.second);
	19	assert(rs == 0);
	20	}
	21

Line 0 Link Here

(-)files/patch-cpp-include-Ice-IncomingAsyncF.h (+15 lines)
	1	--- cpp.orig/include/Ice/IncomingAsyncF.h 2011-06-15 21:43:58.000000000 +0200
	2	+++ cpp/include/Ice/IncomingAsyncF.h 2012-03-04 20:14:52.000000000 +0100
	3	@@ -28,12 +28,6 @@
	4
	5	class AMD_Object_ice_invoke;
	6	class AMD_Array_Object_ice_invoke;
	7	-
	8	-}
	9	-
	10	-namespace IceInternal
	11	-{
	12	-
	13	ICE_API IceUtil::Shared* upCast(::Ice::AMD_Object_ice_invoke*);
	14	ICE_API IceUtil::Shared* upCast(::Ice::AMD_Array_Object_ice_invoke*);
	15

Line 0 Link Here

(-)files/patch-cpp-include-Ice-LocalObjectF.h (+15 lines)
	1	--- cpp.orig/include/Ice/LocalObjectF.h 2011-06-15 21:43:58.000000000 +0200
	2	+++ cpp/include/Ice/LocalObjectF.h 2012-03-04 20:14:52.000000000 +0100
	3	@@ -18,12 +18,6 @@
	4	{
	5
	6	class LocalObject;
	7	-
	8	-}
	9	-
	10	-namespace IceInternal
	11	-{
	12	-
	13	ICE_API IceUtil::Shared* upCast(::Ice::LocalObject*);
	14
	15	}

Line 0 Link Here

(-)files/patch-cpp-include-Ice-ObjectF.h (+22 lines)
	1	--- cpp.orig/include/Ice/ObjectF.h 2011-06-15 21:43:58.000000000 +0200
	2	+++ cpp/include/Ice/ObjectF.h 2012-03-04 20:14:52.000000000 +0100
	3	@@ -17,19 +17,8 @@
	4	{
	5
	6	class Object;
	7	-
	8	-}
	9	-
	10	-namespace IceInternal
	11	-{
	12	-
	13	ICE_API IceUtil::Shared* upCast(::Ice::Object*);
	14
	15	-}
	16	-
	17	-namespace Ice
	18	-{
	19	-
	20	typedef IceInternal::Handle< Object > ObjectPtr;
	21
	22	void ICE_API __patch__ObjectPtr(void*, ObjectPtr&);

Line 0 Link Here

(-)files/patch-cpp-include-Ice-OutgoingAsyncF.h (+17 lines)
	1	--- cpp.orig/include/Ice/OutgoingAsyncF.h 2011-06-15 21:43:58.000000000 +0200
	2	+++ cpp/include/Ice/OutgoingAsyncF.h 2012-03-04 20:14:52.000000000 +0100
	3	@@ -19,13 +19,13 @@
	4
	5	class AsyncResult;
	6	typedef IceInternal::Handle<AsyncResult> AsyncResultPtr;
	7	+ICE_API IceUtil::Shared* upCast(::Ice::AsyncResult*);
	8
	9	}
	10
	11	namespace IceInternal
	12	{
	13
	14	-ICE_API IceUtil::Shared* upCast(::Ice::AsyncResult*);
	15
	16	class OutgoingAsync;
	17	ICE_API IceUtil::Shared* upCast(OutgoingAsync*);

Line 0 Link Here

(-)files/patch-cpp-include-Ice-Proxy.h (+56 lines)
	1	--- cpp.orig/include/Ice/Proxy.h 2011-06-15 21:43:58.000000000 +0200
	2	+++ cpp/include/Ice/Proxy.h 2012-03-04 20:14:52.000000000 +0100
	3	@@ -38,6 +38,8 @@
	4
	5	class Locator;
	6	class Router;
	7	+ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::Locator*);
	8	+ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::Router*);
	9
	10	}
	11
	12	@@ -46,8 +48,6 @@
	13	namespace IceInternal
	14	{
	15
	16	-ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::Locator*);
	17	-ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::Router*);
	18
	19	class LocalExceptionWrapper;
	20
	21	@@ -1172,7 +1172,7 @@
	22
	23	TwowayCallbackNC(const TPtr& instance, bool cb, Exception excb, Sent sentcb) : CallbackNC<T>(instance, excb, sentcb)
	24	{
	25	- checkCallback(instance, cb \|\| excb != 0);
	26	+ this->checkCallback(instance, cb \|\| excb != 0);
	27	}
	28	};
	29
	30	@@ -1188,7 +1188,7 @@
	31
	32	TwowayCallback(const TPtr& instance, bool cb, Exception excb, Sent sentcb) : Callback<T, CT>(instance, excb, sentcb)
	33	{
	34	- checkCallback(instance, cb \|\| excb != 0);
	35	+ this->checkCallback(instance, cb \|\| excb != 0);
	36	}
	37	};
	38
	39	@@ -1209,7 +1209,7 @@
	40	OnewayCallbackNC(const TPtr& instance, Response cb, Exception excb, Sent sentcb) :
	41	CallbackNC<T>(instance, excb, sentcb), response(cb)
	42	{
	43	- checkCallback(instance, cb != 0 \|\| excb != 0);
	44	+ this->checkCallback(instance, cb != 0 \|\| excb != 0);
	45	}
	46
	47	virtual void __completed(const ::Ice::AsyncResultPtr& result) const
	48	@@ -1254,7 +1254,7 @@
	49	OnewayCallback(const TPtr& instance, Response cb, Exception excb, Sent sentcb) :
	50	Callback<T, CT>(instance, excb, sentcb), response(cb)
	51	{
	52	- checkCallback(instance, cb != 0 \|\| excb != 0);
	53	+ this->checkCallback(instance, cb != 0 \|\| excb != 0);
	54	}
	55
	56	virtual void __completed(const ::Ice::AsyncResultPtr& result) const

Line 0 Link Here

(-)files/patch-cpp-include-Ice-ProxyF.h (+76 lines)
		1	--- cpp.orig/include/Ice/ProxyF.h 2011-06-15 21:43:58.000000000 +0200
		2	+++ cpp/include/Ice/ProxyF.h 2012-03-04 20:14:52.000000000 +0100
		3	@@ -22,6 +22,11 @@
		4	{
		5
		6	class Object;
		7	+inline ::IceProxy::Ice::Object*
		8	+upCast(::IceProxy::Ice::Object* o)
		9	+{
		10	+ return o;
		11	+}
		12
		13	}
		14
		15	@@ -34,6 +39,11 @@
		16	{
		17
		18	class Object;
		19	+inline ::IceDelegate::Ice::Object*
		20	+upCast(::IceDelegate::Ice::Object* o)
		21	+{
		22	+ return o;
		23	+}
		24
		25	}
		26
		27	@@ -47,6 +57,12 @@
		28
		29	class Object;
		30
		31	+inline ::IceDelegateM::Ice::Object*
		32	+upCast(::IceDelegateM::Ice::Object* o)
		33	+{
		34	+ return o;
		35	+}
		36	+
		37	}
		38
		39	}
		40	@@ -58,36 +74,12 @@
		41	{
		42
		43	class Object;
		44	-
		45	-}
		46	-
		47	-}
		48	-
		49	-namespace IceInternal
		50	-{
		51	-
		52	-inline ::IceProxy::Ice::Object*
		53	-upCast(::IceProxy::Ice::Object* o)
		54	-{
		55	- return o;
		56	-}
		57	-
		58	-inline ::IceDelegate::Ice::Object*
		59	-upCast(::IceDelegate::Ice::Object* o)
		60	-{
		61	- return o;
		62	-}
		63	-
		64	inline ::IceDelegateD::Ice::Object*
65	upCast(::IceDelegateD::Ice::Object* o)
66	{
67	return o;
68	}
69
70	-inline ::IceDelegateM::Ice::Object*
71	-upCast(::IceDelegateM::Ice::Object* o)
72	-{
73	- return o;
74	}
75
76	}

Line 0 Link Here

(-)files/patch-cpp-include-Ice-Stream.h (+79 lines)
		1	--- cpp.orig/include/Ice/Stream.h 2011-06-15 21:43:58.000000000 +0200
		2	+++ cpp/include/Ice/Stream.h 2012-03-04 20:14:52.000000000 +0100
		3	@@ -17,6 +17,12 @@
		4	#include <Ice/Proxy.h>
		5	#include <IceUtil/Shared.h>
		6
		7	+namespace IceInternal
		8	+{
		9	+ // Forward declaration required for writer specializations.
		10	+ void delegateThrowMarshalException(const char*, int, const ::std::string&);
		11	+}
		12	+
		13	namespace Ice
		14	{
		15
		16	@@ -45,9 +51,6 @@
		17	StreamTraitTypeUnknown
		18	};
		19
		20	-// Forward declaration required for writer specializations.
		21	-class MarshalException;
		22	-
		23	//
		24	// Base trait template. This doesn't actually do anything -- we just
		25	// use it as a template that we can specialize.
		26	@@ -542,7 +545,7 @@
		27	{
		28	if(static_cast<int>(v) < 0 \|\| static_cast<int>(v) >= StreamTrait<T>::enumLimit)
		29	{
		30	- throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
		31	+ IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
		32	}
		33	outS->write(static_cast<Byte>(v));
		34	}
		35	@@ -558,7 +561,7 @@
		36	inS->read(val);
		37	if(val > StreamTrait<T>::enumLimit)
		38	{
		39	- throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
		40	+ IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
		41	}
		42	v = static_cast<T>(val);
		43	}
		44	@@ -573,7 +576,7 @@
		45	{
		46	if(static_cast<int>(v) < 0 \|\| static_cast<int>(v) >= StreamTrait<T>::enumLimit)
		47	{
		48	- throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
		49	+ IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
		50	}
		51	outS->write(static_cast<Short>(v));
		52	}
		53	@@ -589,7 +592,7 @@
		54	inS->read(val);
		55	if(val < 0 \|\| val > StreamTrait<T>::enumLimit)
		56	{
		57	- throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
		58	+ IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
		59	}
		60	v = static_cast<T>(val);
		61	}
		62	@@ -603,7 +606,7 @@
		63	{
		64	if(static_cast<int>(v) < 0 \|\| static_cast<int>(v) >= StreamTrait<T>::enumLimit)
65	{
66	- throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
67	+ IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
68	}
69	outS->write(static_cast<Int>(v));
70	}
71	@@ -619,7 +622,7 @@
72	inS->read(val);
73	if(val < 0 \|\| val > StreamTrait<T>::enumLimit)
74	{
75	- throw MarshalException(__FILE__, __LINE__, "enumerator out of range");
76	+ IceInternal::delegateThrowMarshalException(__FILE__, __LINE__, "enumerator out of range");
77	}
78	v = static_cast<T>(val);
79	}

Line 0 Link Here

(-)files/patch-cpp-include-Ice-StreamF.h (+15 lines)
	1	--- cpp.orig/include/Ice/StreamF.h 2011-06-15 21:43:58.000000000 +0200
	2	+++ cpp/include/Ice/StreamF.h 2012-03-04 20:14:52.000000000 +0100
	3	@@ -19,12 +19,6 @@
	4
	5	class InputStream;
	6	class OutputStream;
	7	-
	8	-}
	9	-
	10	-namespace IceInternal
	11	-{
	12	-
	13	ICE_API IceUtil::Shared* upCast(::Ice::InputStream*);
	14	ICE_API IceUtil::Shared* upCast(::Ice::OutputStream*);
	15

Line 0 Link Here

(-)files/patch-cpp-include-IceUtil-Mutex.h (+15 lines)
	1	--- cpp.orig/include/IceUtil/Mutex.h 2011-06-15 21:43:58.000000000 +0200
	2	+++ cpp/include/IceUtil/Mutex.h 2012-03-04 20:14:52.000000000 +0100
	3	@@ -251,8 +251,11 @@
	4	inline
	5	Mutex::~Mutex()
	6	{
	7	+#ifndef NDEBUG
	8	int rc = 0;
	9	- rc = pthread_mutex_destroy(&_mutex);
	10	+ rc =
	11	+#endif
	12	+ pthread_mutex_destroy(&_mutex);
	13	assert(rc == 0);
	14	}
	15

Line 0 Link Here

(-)files/patch-cpp-src-Freeze-MapDb.cpp (+15 lines)
	1	--- cpp.orig/src/Freeze/MapDb.cpp 2011-06-15 21:43:58.000000000 +0200
	2	+++ cpp/src/Freeze/MapDb.cpp 2012-03-04 20:14:52.000000000 +0100
	3	@@ -229,7 +229,11 @@
	4	#ifndef NDEBUG
	5	bool inserted =
	6	#endif
	7	- _indices.insert(IndexMap::value_type(indexBase->name(), indexI.get())).second;
	8	+ _indices.insert(IndexMap::value_type(indexBase->name(), indexI.get()))
	9	+#ifndef NDEBUG
	10	+ .second
	11	+#endif
	12	+ ;
	13	assert(inserted);
	14
	15	indexBase->_impl = indexI.release();

Line 0 Link Here

(-)files/patch-cpp-src-Freeze-MapI.cpp (+41 lines)
	1	--- cpp.orig/src/Freeze/MapI.cpp 2011-06-15 21:43:58.000000000 +0200
	2	+++ cpp/src/Freeze/MapI.cpp 2012-03-04 20:14:52.000000000 +0100
	3	@@ -749,8 +749,11 @@
	4
	5	try
	6	{
	7	+#ifndef NDEBUG
	8	int err;
	9	- err = _dbc->put(&dbKey, &dbValue, DB_CURRENT);
	10	+ err =
	11	+#endif
	12	+ _dbc->put(&dbKey, &dbValue, DB_CURRENT);
	13	assert(err == 0);
	14	}
	15	catch(const ::DbDeadlockException& dx)
	16	@@ -1023,7 +1026,11 @@
	17	#ifndef NDEBUG
	18	bool inserted =
	19	#endif
	20	- _indices.insert(IndexMap::value_type(indexBase->name(), indexBase)).second;
	21	+ _indices.insert(IndexMap::value_type(indexBase->name(), indexBase))
	22	+#ifndef NDEBUG
	23	+ .second
	24	+#endif
	25	+ ;
	26	assert(inserted);
	27	indexBase->_map = this;
	28	}
	29	@@ -1360,8 +1367,11 @@
	30	try
	31	{
	32	u_int32_t count;
	33	+#ifndef NDEBUG
	34	int err;
	35	- err = _db->truncate(txn, &count, txn != 0 ? 0 : DB_AUTO_COMMIT);
	36	+ err =
	37	+#endif
	38	+ _db->truncate(txn, &count, txn != 0 ? 0 : DB_AUTO_COMMIT);
	39	assert(err == 0);
	40	break;
	41	}

Line 0 Link Here

(-)files/patch-cpp-src-Freeze-SharedDbEnv.cpp (+15 lines)
	1	--- cpp.orig/src/Freeze/SharedDbEnv.cpp 2011-06-15 21:43:58.000000000 +0200
	2	+++ cpp/src/Freeze/SharedDbEnv.cpp 2012-03-04 20:14:52.000000000 +0100
	3	@@ -336,8 +336,11 @@
	4	// Remove from map
	5	//
	6
	7	+#ifndef NDEBUG
	8	size_t one;
	9	- one = sharedDbEnvMap->erase(key);
	10	+ one =
	11	+#endif
	12	+ sharedDbEnvMap->erase(key);
	13	assert(one == 1);
	14
	15	if(sharedDbEnvMap->size() == 0)

Line 0 Link Here

(-)files/patch-cpp-src-Glacier2-Blobject.cpp (+18 lines)
	1	--- cpp.orig/src/Glacier2/Blobject.cpp 2011-06-15 21:43:58.000000000 +0200
	2	+++ cpp/src/Glacier2/Blobject.cpp 2012-03-04 19:39:27.000000000 +0100
	3	@@ -171,6 +171,15 @@
	4	}
	5
	6	void
	7	+Glacier2::Blobject::destroy()
	8	+{
	9	+ if(_requestQueue)
	10	+ {
	11	+ _requestQueue->destroy();
	12	+ }
	13	+}
	14	+
	15	+void
	16	Glacier2::Blobject::invoke(ObjectPrx& proxy, const AMD_Object_ice_invokePtr& amdCB,
	17	const std::pair<const Ice::Byte, const Ice::Byte>& inParams, const Current& current)
	18	{

Line 0 Link Here

(-)files/patch-cpp-src-Glacier2-RequestQueue.cpp (+74 lines)
		1	--- cpp.orig/src/Glacier2/RequestQueue.cpp 2011-06-15 21:43:58.000000000 +0200
		2	+++ cpp/src/Glacier2/RequestQueue.cpp 2012-03-04 19:39:27.000000000 +0100
		3	@@ -185,7 +185,8 @@
		4	_callback(newCallback_Object_ice_invoke(this, &RequestQueue::response, &RequestQueue::exception,
		5	&RequestQueue::sent)),
		6	_flushCallback(newCallback_Connection_flushBatchRequests(this, &RequestQueue::exception, &RequestQueue::sent)),
		7	- _pendingSend(false)
		8	+ _pendingSend(false),
		9	+ _destroyed(false)
		10	{
		11	}
		12
		13	@@ -241,6 +242,37 @@
		14	}
		15
		16	void
		17	+Glacier2::RequestQueue::destroy()
		18	+{
		19	+ IceUtil::Mutex::Lock lock(*this);
		20	+
		21	+ _destroyed = true;
		22	+
		23	+ //
		24	+ // Although the session has been destroyed, we cannot destroy this queue
		25	+ // until all requests have completed.
		26	+ //
		27	+ if(_requests.empty())
		28	+ {
		29	+ destroyInternal();
		30	+ }
		31	+}
		32	+
		33	+void
		34	+Glacier2::RequestQueue::destroyInternal()
		35	+{
		36	+ //
		37	+ // Must be called with the mutex locked.
		38	+ //
		39	+
		40	+ //
		41	+ // Remove cyclic references.
		42	+ //
		43	+ const_cast<Ice::Callback_Object_ice_invokePtr&>(_callback) = 0;
		44	+ const_cast<Ice::Callback_Connection_flushBatchRequestsPtr&>(_flushCallback) = 0;
		45	+}
		46	+
		47	+void
		48	Glacier2::RequestQueue::flush()
		49	{
		50	assert(_connection);
		51	@@ -289,6 +321,11 @@
		52	_pendingSendRequest = 0;
		53	}
		54	}
		55	+
		56	+ if(_destroyed && _requests.empty())
		57	+ {
		58	+ destroyInternal();
		59	+ }
		60	}
		61
		62	void
		63	@@ -312,6 +349,11 @@
		64	}
65	}
66	_requests.clear();
67	+
68	+ if(_destroyed)
69	+ {
70	+ destroyInternal();
71	+ }
72	}
73
74	void

Line 0 Link Here

(-)files/patch-cpp-src-Glacier2-RequestQueue.h (+23 lines)
	1	--- cpp.orig/src/Glacier2/RequestQueue.h 2011-06-15 21:43:58.000000000 +0200
	2	+++ cpp/src/Glacier2/RequestQueue.h 2012-03-04 19:39:27.000000000 +0100
	3	@@ -65,8 +65,12 @@
	4	bool addRequest(const RequestPtr&);
	5	void flushRequests(std::set<Ice::ObjectPrx>&);
	6
	7	+ void destroy();
	8	+
	9	private:
	10
	11	+ void destroyInternal();
	12	+
	13	void flush();
	14	void flush(std::set<Ice::ObjectPrx>&);
	15
	16	@@ -83,6 +87,7 @@
	17	std::deque<RequestPtr> _requests;
	18	bool _pendingSend;
	19	RequestPtr _pendingSendRequest;
	20	+ bool _destroyed;
	21	};
	22	typedef IceUtil::Handle<RequestQueue> RequestQueuePtr;
	23

Line 0 Link Here

(-)files/patch-cpp-src-Glacier2-RouterI.cpp (+15 lines)
	1	--- cpp.orig/src/Glacier2/RouterI.cpp 2011-06-15 21:43:58.000000000 +0200
	2	+++ cpp/src/Glacier2/RouterI.cpp 2012-03-04 19:39:27.000000000 +0100
	3	@@ -98,6 +98,12 @@
	4	_session->destroy_async(amiCB);
	5	}
	6	}
	7	+
	8	+ _clientBlobject->destroy();
	9	+ if(_serverBlobject)
	10	+ {
	11	+ _serverBlobject->destroy();
	12	+ }
	13	}
	14
	15	ObjectPrx

Line 0 Link Here

(-)files/patch-cpp-src-Ice-ConnectionI.cpp (+27 lines)
	1	--- cpp.orig/src/Ice/ConnectionI.cpp 2011-06-15 21:43:58.000000000 +0200
	2	+++ cpp/src/Ice/ConnectionI.cpp 2012-03-04 20:14:52.000000000 +0100
	3	@@ -31,7 +31,7 @@
	4	using namespace Ice;
	5	using namespace IceInternal;
	6
	7	-Ice::LocalObject* IceInternal::upCast(ConnectionI* p) { return p; }
	8	+Ice::LocalObject* Ice::upCast(ConnectionI* p) { return p; }
	9
	10	namespace
	11	{
	12	@@ -600,6 +600,7 @@
	13	}
	14	catch(const LocalException& ex)
	15	{
	16	+ status = IceInternal::AsyncStatusQueued; // this is only to apeace the compiler
	17	setState(StateClosed, ex);
	18	assert(_exception.get());
	19	_exception->ice_throw();
	20	@@ -971,6 +972,7 @@
	21	}
	22	catch(const Ice::LocalException& ex)
	23	{
	24	+ status = IceInternal::AsyncStatusQueued; // this is only to apeace the compiler
	25	setState(StateClosed, ex);
	26	assert(_exception.get());
	27	_exception->ice_throw();

Line 0 Link Here

(-)files/patch-cpp-src-Ice-PropertyNames.cpp (+20 lines)
	1	--- cpp.orig/src/Ice/PropertyNames.cpp 2011-06-15 21:43:59.000000000 +0200
	2	+++ cpp/src/Ice/PropertyNames.cpp 2012-03-04 19:55:44.000000000 +0100
	3	@@ -8,7 +8,7 @@
	4	// **********************************************************************
	5
	6	//
	7	-// Generated by makeprops.py from file ..\config\PropertyNames.xml, Mon May 09 07:39:43 2011
	8	+// Generated by makeprops.py from file ../config/PropertyNames.xml, Tue Jul 12 07:22:34 2011
	9
	10	// IMPORTANT: Do not edit this file -- any edits made here will be lost!
	11
	12	@@ -335,6 +335,8 @@
	13	IceInternal::Property("IceGrid.Registry.PermissionsVerifier", false, 0),
	14	IceInternal::Property("IceGrid.Registry.ReplicaName", false, 0),
	15	IceInternal::Property("IceGrid.Registry.ReplicaSessionTimeout", false, 0),
	16	+ IceInternal::Property("IceGrid.Registry.RequireNodeCertCN", false, 0),
	17	+ IceInternal::Property("IceGrid.Registry.RequireReplicaCertCN", false, 0),
	18	IceInternal::Property("IceGrid.Registry.Server.ACM", false, 0),
	19	IceInternal::Property("IceGrid.Registry.Server.AdapterId", false, 0),
	20	IceInternal::Property("IceGrid.Registry.Server.Endpoints", false, 0),

Line 0 Link Here

(-)files/patch-cpp-src-Ice-Stream.cpp (+24 lines)
	1	--- cpp.orig/src/Ice/Stream.cpp 2011-06-15 21:43:59.000000000 +0200
	2	+++ cpp/src/Ice/Stream.cpp 2012-03-04 20:14:53.000000000 +0100
	3	@@ -8,10 +8,19 @@
	4	// **********************************************************************
	5
	6	#include <Ice/Stream.h>
	7	+#include <Ice/LocalException.h>
	8
	9	using namespace std;
	10	using namespace Ice;
	11	using namespace IceInternal;
	12
	13	-IceUtil::Shared* IceInternal::upCast(InputStream* p) { return p; }
	14	-IceUtil::Shared* IceInternal::upCast(OutputStream* p) { return p; }
	15	+IceUtil::Shared* Ice::upCast(InputStream* p) { return p; }
	16	+IceUtil::Shared* Ice::upCast(OutputStream* p) { return p; }
	17	+
	18	+namespace IceInternal
	19	+{
	20	+ void delegateThrowMarshalException(const char* file, int line , const ::std::string& message)
	21	+ {
	22	+ throw Ice::MarshalException(file, line, message);
	23	+ }
	24	+}

Line 0 Link Here

(-)files/patch-cpp-src-IceGrid-AdminCallbackRouter.cpp (+16 lines)
	1	--- cpp.orig/src/IceGrid/AdminCallbackRouter.cpp 2011-06-15 21:43:59.000000000 +0200
	2	+++ cpp/src/IceGrid/AdminCallbackRouter.cpp 2012-03-04 20:14:53.000000000 +0100
	3	@@ -49,7 +49,12 @@
	4	#ifndef NDEBUG
	5	bool inserted =
	6	#endif
	7	- _categoryToConnection.insert(map<string, ConnectionPtr>::value_type(category, con)).second;
	8	+ _categoryToConnection.insert(map<string, ConnectionPtr>::value_type(category, con))
	9	+#ifndef NDEBUG
	10	+ .second
	11	+#endif
	12	+ ;
	13	+
	14
	15	assert(inserted == true);
	16	}