diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Security')
10 files changed, 56 insertions, 69 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.cpp index d03376c5459..a0cec544909 100644 --- a/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.cpp @@ -17,14 +17,14 @@ TAO_EstablishTrustPolicy::~TAO_EstablishTrustPolicy (void) } CORBA::PolicyType -TAO_EstablishTrustPolicy::policy_type (CORBA::Environment & /* ACE_TRY_ENV */) +TAO_EstablishTrustPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { return Security::SecEstablishTrustPolicy; } CORBA::Policy_ptr -TAO_EstablishTrustPolicy::copy (CORBA::Environment &ACE_TRY_ENV) +TAO_EstablishTrustPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_EstablishTrustPolicy *policy = 0; @@ -41,13 +41,13 @@ TAO_EstablishTrustPolicy::copy (CORBA::Environment &ACE_TRY_ENV) } void -TAO_EstablishTrustPolicy::destroy (CORBA::Environment & /* ACE_TRY_ENV */) +TAO_EstablishTrustPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { } Security::EstablishTrust -TAO_EstablishTrustPolicy::trust (CORBA::Environment & /* ACE_TRY_ENV */) +TAO_EstablishTrustPolicy::trust (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->trust_; diff --git a/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.h b/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.h index ebedb814109..5fd059b6a07 100644 --- a/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.h @@ -51,23 +51,20 @@ public: * @name CORBA::Policy Methods */ //@{ - virtual CORBA::PolicyType policy_type (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Policy_ptr copy (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} /// Return the "establish trust" value associated with this /// policy. virtual Security::EstablishTrust trust ( - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.cpp index 495ec1e5bc7..3b306b5aaf8 100644 --- a/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.cpp @@ -16,14 +16,14 @@ TAO_QOPPolicy::~TAO_QOPPolicy (void) } CORBA::PolicyType -TAO_QOPPolicy::policy_type (CORBA::Environment & /* ACE_TRY_ENV */) +TAO_QOPPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { return Security::SecQOPPolicy; } CORBA::Policy_ptr -TAO_QOPPolicy::copy (CORBA::Environment &ACE_TRY_ENV) +TAO_QOPPolicy::copy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_QOPPolicy *policy = 0; @@ -40,13 +40,13 @@ TAO_QOPPolicy::copy (CORBA::Environment &ACE_TRY_ENV) } void -TAO_QOPPolicy::destroy (CORBA::Environment & /* ACE_TRY_ENV */) +TAO_QOPPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { } Security::QOP -TAO_QOPPolicy::qop (CORBA::Environment & /* ACE_TRY_ENV */) +TAO_QOPPolicy::qop (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { return this->qop_; diff --git a/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.h b/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.h index 1431ec768eb..0579628d355 100644 --- a/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.h @@ -51,23 +51,19 @@ public: * @name CORBA::Policy Methods */ //@{ - virtual CORBA::PolicyType policy_type (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual CORBA::PolicyType policy_type (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual CORBA::Policy_ptr copy (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual CORBA::Policy_ptr copy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void destroy (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual void destroy (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} /// Return the Quality-of-Protection value associated with this /// policy. - virtual Security::QOP qop (CORBA::Environment &ACE_TRY_ENV = - TAO_default_environment ()) + virtual Security::QOP qop (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); protected: diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp index 6e6335855d0..bccb5842a4d 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp @@ -25,8 +25,8 @@ TAO_Security_Current::~TAO_Security_Current (void) Security::AttributeList * TAO_Security_Current::get_attributes ( - const Security::AttributeTypeList &attributes, - CORBA::Environment &ACE_TRY_ENV) + const Security::AttributeTypeList &attributes + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Security_Current_Impl *impl = this->implementation (); @@ -37,12 +37,12 @@ TAO_Security_Current::get_attributes ( if (impl == 0) ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0); - return impl->get_attributes (attributes, ACE_TRY_ENV); + return impl->get_attributes (attributes TAO_ENV_ARG_PARAMETER); } SecurityLevel2::ReceivedCredentials_ptr TAO_Security_Current::received_credentials ( - CORBA::Environment &ACE_TRY_ENV) + TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO_Security_Current_Impl *impl = this->implementation (); @@ -53,7 +53,7 @@ TAO_Security_Current::received_credentials ( if (impl == 0) ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0); - return impl->received_credentials (ACE_TRY_ENV); + return impl->received_credentials (TAO_ENV_SINGLE_ARG_PARAMETER); } int @@ -61,15 +61,15 @@ TAO_Security_Current::init (void) { int result = 0; - ACE_DECLARE_NEW_CORBA_ENV; + TAO_ENV_DECLARE_NEW_ENV; ACE_TRY { int argc = 0; char **argv = 0; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - this->orb_id_.in (), - ACE_TRY_ENV); + this->orb_id_.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; this->orb_core_ = orb.in ()->orb_core (); diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h index b0b0087fb9c..2dd683bf77c 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h @@ -62,8 +62,8 @@ public: /// Return the security attributes corresponding to the types in the /// given attribute type list associated with the current request. virtual Security::AttributeList * get_attributes ( - const Security::AttributeTypeList & attributes, - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + const Security::AttributeTypeList & attributes + TAO_ENV_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} @@ -77,7 +77,7 @@ public: /// Return the Credentials received from the client associate with /// the current request. virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials ( - CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ()) + TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) ACE_THROW_SPEC ((CORBA::SystemException)); //@} diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h index bbce76103c2..a911373a459 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h @@ -52,8 +52,8 @@ public: /// Return the security attributes corresponding to the types in the /// given attribute type list associated with the current request. virtual Security::AttributeList * get_attributes ( - const Security::AttributeTypeList & attributes, - CORBA::Environment &ACE_TRY_ENV) + const Security::AttributeTypeList & attributes + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; //@} @@ -67,7 +67,7 @@ public: /// Return the Credentials received from the client associate with /// the current request. virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials ( - CORBA::Environment &ACE_TRY_ENV) + TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; //@} diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp index c63a5257c58..991c107ac90 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp @@ -19,14 +19,12 @@ TAO_Security_ORBInitializer::pre_init ( TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_ENV_ARG_DEFN; - // @@ This is busted. TAO_ORBInitInfo should do proper reference // counting. // Narrow to a TAO_ORBInitInfo object to get access to the // allocate_tss_slot_id() TAO extension. - TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info, - ACE_TRY_ENV); + TAO_ORBInitInfo_var tao_info = TAO_ORBInitInfo::_narrow (info + TAO_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (tao_info.in ())) @@ -43,11 +41,11 @@ TAO_Security_ORBInitializer::pre_init ( // Reserve a TSS slot in the ORB core internal TSS resources for the // thread-specific portion of Security::Current. - size_t tss_slot = tao_info->allocate_tss_slot_id (0, - ACE_TRY_ENV); + size_t tss_slot = tao_info->allocate_tss_slot_id (0 + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - CORBA::String_var orb_id = info->orb_id (ACE_TRY_ENV); + CORBA::String_var orb_id = info->orb_id (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Create the SecurityLevel2::Current object. @@ -66,8 +64,8 @@ TAO_Security_ORBInitializer::pre_init ( // Register the SecurityLevel2::Current object reference with the // ORB. info->register_initial_reference ("SecurityCurrent", - security_current.in (), - ACE_TRY_ENV); + security_current.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -77,17 +75,15 @@ TAO_Security_ORBInitializer::post_init ( TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - TAO_ENV_ARG_DEFN; - - this->register_policy_factories (info, - ACE_TRY_ENV); + this->register_policy_factories (info + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void TAO_Security_ORBInitializer::register_policy_factories ( - PortableInterceptor::ORBInitInfo_ptr info, - CORBA::Environment &ACE_TRY_ENV) + PortableInterceptor::ORBInitInfo_ptr info + TAO_ENV_ARG_DECL) { // Register the security policy factories. @@ -101,41 +97,41 @@ TAO_Security_ORBInitializer::register_policy_factories ( // the different types of security policies. CORBA::PolicyType type; - + type = Security::SecQOPPolicy; info->register_policy_factory (type, - policy_factory, - ACE_TRY_ENV); + policy_factory + TAO_ENV_ARG_PARAMETER); ACE_CHECK; type = Security::SecMechanismsPolicy; info->register_policy_factory (type, - policy_factory, - ACE_TRY_ENV); + policy_factory + TAO_ENV_ARG_PARAMETER); ACE_CHECK; type = Security::SecInvocationCredentialsPolicy; info->register_policy_factory (type, - policy_factory, - ACE_TRY_ENV); + policy_factory + TAO_ENV_ARG_PARAMETER); ACE_CHECK; type = Security::SecFeaturePolicy; // Deprecated info->register_policy_factory (type, - policy_factory, - ACE_TRY_ENV); + policy_factory + TAO_ENV_ARG_PARAMETER); ACE_CHECK; type = Security::SecDelegationDirectivePolicy; info->register_policy_factory (type, - policy_factory, - ACE_TRY_ENV); + policy_factory + TAO_ENV_ARG_PARAMETER); ACE_CHECK; type = Security::SecEstablishTrustPolicy; info->register_policy_factory (type, - policy_factory, - ACE_TRY_ENV); + policy_factory + TAO_ENV_ARG_PARAMETER); ACE_CHECK; // ---------------------------------------------------------------- diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h index 0698058b90f..af1aecce473 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h @@ -59,8 +59,8 @@ private: /// Register Security policy factories. void register_policy_factories ( - PortableInterceptor::ORBInitInfo_ptr info, - CORBA::Environment &ACE_TRY_ENV); + PortableInterceptor::ORBInitInfo_ptr info + TAO_ENV_ARG_DECL); private: diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp index 9a0a617f61e..6d69fbbcd95 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp @@ -19,8 +19,6 @@ TAO_Security_PolicyFactory::create_policy ( ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)) { - TAO_ENV_ARG_DEFN; - // Not all security policies can be created using the // ORB::create_policy() mechanism. Only those that can be created // using that mechanism are supported by this factory. |