summaryrefslogtreecommitdiff
path: root/cpp/src/IceGrid/ReplicaSessionManager.cpp
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2015-03-11 11:48:35 -0400
committerJoe George <joe@zeroc.com>2015-05-12 11:42:05 -0400
commitdc60da4d945f25a8192e97eae9f32a62b0e1a61d (patch)
tree86108b0cf5a89cf8017efac9f0ee0589f0fa4e8f /cpp/src/IceGrid/ReplicaSessionManager.cpp
parentIce 3.4.2 Patch 5 (diff)
downloadice-dc60da4d945f25a8192e97eae9f32a62b0e1a61d.tar.bz2
ice-dc60da4d945f25a8192e97eae9f32a62b0e1a61d.tar.xz
ice-dc60da4d945f25a8192e97eae9f32a62b0e1a61d.zip
Various Fixes
- Added support for this functionality to connecting registry - replicas - Renamed the property to IceGrid.Registry.RequireNodeCertCN and added IceGrid.Registry.RequireReplicaCertCN - Use the IceGrid::PermissionDeniedException to reject the connection and print an appropriate error message on the node side. - Reject non SSL connections if the property is configured - Added support for the property in the secure IceGrid demo.
Diffstat (limited to 'cpp/src/IceGrid/ReplicaSessionManager.cpp')
-rw-r--r--cpp/src/IceGrid/ReplicaSessionManager.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/cpp/src/IceGrid/ReplicaSessionManager.cpp b/cpp/src/IceGrid/ReplicaSessionManager.cpp
index 57997d60027..b2114dc1b12 100644
--- a/cpp/src/IceGrid/ReplicaSessionManager.cpp
+++ b/cpp/src/IceGrid/ReplicaSessionManager.cpp
@@ -500,6 +500,14 @@ ReplicaSessionManager::createSession(InternalRegistryPrx& registry, IceUtil::Tim
}
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());