diff options
| author | Bernard Normier <bernard@zeroc.com> | 2014-08-29 11:24:49 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2014-08-29 11:24:49 -0400 |
| commit | 33702f21d02bd543f365e4db6e118ba5257c109b (patch) | |
| tree | 5ee69df98dcb14ba47d60e727c59f6f1018692a5 /cpp/src/IceGrid/RegistryI.h | |
| parent | Minor fix for JS OutgoingConnectionFactory (diff) | |
| download | ice-33702f21d02bd543f365e4db6e118ba5257c109b.tar.bz2 ice-33702f21d02bd543f365e4db6e118ba5257c109b.tar.xz ice-33702f21d02bd543f365e4db6e118ba5257c109b.zip | |
New fix for ICE-5637: Glacier2CryptPermissionsVerifier plugin + Glacier2Internal::setupNullPermissionsVerifier function
Diffstat (limited to 'cpp/src/IceGrid/RegistryI.h')
| -rw-r--r-- | cpp/src/IceGrid/RegistryI.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/cpp/src/IceGrid/RegistryI.h b/cpp/src/IceGrid/RegistryI.h index e4a303e533b..704ed0dd9f9 100644 --- a/cpp/src/IceGrid/RegistryI.h +++ b/cpp/src/IceGrid/RegistryI.h @@ -88,13 +88,11 @@ private: QueryPrx setupQuery(); RegistryPrx setupRegistry(); InternalRegistryPrx setupInternalRegistry(); - void setupNullPermissionsVerifier(); bool setupUserAccountMapper(); Ice::ObjectAdapterPtr setupClientSessionFactory(const LocatorPrx&); Ice::ObjectAdapterPtr setupAdminSessionFactory(const Ice::ObjectPtr&, const LocatorPrx&); - Glacier2::PermissionsVerifierPrx getPermissionsVerifier(const LocatorPrx&, const std::string&, const std::string&); - + Glacier2::PermissionsVerifierPrx getPermissionsVerifier(const LocatorPrx&, const std::string&); Glacier2::SSLPermissionsVerifierPrx getSSLPermissionsVerifier(const LocatorPrx&, const std::string&); Glacier2::SSLInfo getSSLInfo(const Ice::ConnectionPtr&, std::string&); @@ -121,10 +119,7 @@ private: int _sessionTimeout; IceUtil::UniquePtr<ReplicaSessionManager> _session; mutable PlatformInfo _platform; - - Glacier2::PermissionsVerifierPrx _nullPermissionsVerifier; - Glacier2::SSLPermissionsVerifierPrx _nullSSLPermissionsVerifier; - + ClientSessionFactoryPtr _clientSessionFactory; Glacier2::PermissionsVerifierPrx _clientVerifier; Glacier2::SSLPermissionsVerifierPrx _sslClientVerifier; |