diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/Security')
21 files changed, 86 insertions, 163 deletions
diff --git a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp index 244b3dd3e6e..a943d276918 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL2_EstablishTrustPolicy.cpp @@ -23,8 +23,7 @@ TAO::Security::EstablishTrustPolicy::~EstablishTrustPolicy (void) } CORBA::PolicyType -TAO::Security::EstablishTrustPolicy::policy_type ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO::Security::EstablishTrustPolicy::policy_type () ACE_THROW_SPEC ((CORBA::SystemException)) { return ::Security::SecEstablishTrustPolicy; diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp index ce1f7d6f1f9..c3322d69bb3 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.cpp @@ -30,8 +30,7 @@ TAO::SL3::ContextEstablishmentPolicy::~ContextEstablishmentPolicy (void) } SecurityLevel3::CredsDirective -TAO::SL3::ContextEstablishmentPolicy::creds_directive ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO::SL3::ContextEstablishmentPolicy::creds_directive () ACE_THROW_SPEC ((CORBA::SystemException)) { return this->creds_directive_; @@ -51,40 +50,35 @@ TAO::SL3::ContextEstablishmentPolicy::creds_list (void) } SecurityLevel3::FeatureDirective -TAO::SL3::ContextEstablishmentPolicy::use_client_auth ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO::SL3::ContextEstablishmentPolicy::use_client_auth () ACE_THROW_SPEC ((CORBA::SystemException)) { return this->use_client_auth_; } SecurityLevel3::FeatureDirective -TAO::SL3::ContextEstablishmentPolicy::use_target_auth ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO::SL3::ContextEstablishmentPolicy::use_target_auth () ACE_THROW_SPEC ((CORBA::SystemException)) { return this->use_target_auth_; } SecurityLevel3::FeatureDirective -TAO::SL3::ContextEstablishmentPolicy::use_confidentiality ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO::SL3::ContextEstablishmentPolicy::use_confidentiality () ACE_THROW_SPEC ((CORBA::SystemException)) { return this->use_confidentiality_; } SecurityLevel3::FeatureDirective -TAO::SL3::ContextEstablishmentPolicy::use_integrity ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO::SL3::ContextEstablishmentPolicy::use_integrity () ACE_THROW_SPEC ((CORBA::SystemException)) { return this->use_integrity_; } CORBA::PolicyType -TAO::SL3::ContextEstablishmentPolicy::policy_type ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO::SL3::ContextEstablishmentPolicy::policy_type () ACE_THROW_SPEC ((CORBA::SystemException)) { return SecurityLevel3::ContextEstablishmentPolicyType; @@ -109,8 +103,7 @@ TAO::SL3::ContextEstablishmentPolicy::copy (void) } void -TAO::SL3::ContextEstablishmentPolicy::destroy ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO::SL3::ContextEstablishmentPolicy::destroy () ACE_THROW_SPEC ((CORBA::SystemException)) { this->creds_directive_ = SecurityLevel3::CD_Default; diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h index dfb5b5a2516..bd664701111 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ContextEstablishmentPolicy.h @@ -65,28 +65,22 @@ namespace TAO * SecurityLevel3::ContextEstablishmentPolicy interface. */ //@{ - virtual SecurityLevel3::CredsDirective creds_directive ( - ACE_ENV_SINGLE_ARG_DECL) + virtual SecurityLevel3::CredsDirective creds_directive () ACE_THROW_SPEC ((CORBA::SystemException)); - virtual SecurityLevel3::OwnCredentialsList * creds_list ( - ACE_ENV_SINGLE_ARG_DECL) + virtual SecurityLevel3::OwnCredentialsList * creds_list () ACE_THROW_SPEC ((CORBA::SystemException)); - virtual SecurityLevel3::FeatureDirective use_client_auth ( - ACE_ENV_SINGLE_ARG_DECL) + virtual SecurityLevel3::FeatureDirective use_client_auth () ACE_THROW_SPEC ((CORBA::SystemException)); - virtual SecurityLevel3::FeatureDirective use_target_auth ( - ACE_ENV_SINGLE_ARG_DECL) + virtual SecurityLevel3::FeatureDirective use_target_auth () ACE_THROW_SPEC ((CORBA::SystemException)); - virtual SecurityLevel3::FeatureDirective use_confidentiality ( - ACE_ENV_SINGLE_ARG_DECL) + virtual SecurityLevel3::FeatureDirective use_confidentiality () ACE_THROW_SPEC ((CORBA::SystemException)); - virtual SecurityLevel3::FeatureDirective use_integrity ( - ACE_ENV_SINGLE_ARG_DECL) + virtual SecurityLevel3::FeatureDirective use_integrity () ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::PolicyType policy_type (void) diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h index 6320a50b252..1e05626032f 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsAcquirerFactory.h @@ -52,8 +52,7 @@ namespace TAO /// Create a TAO::SL3::CredentialsAcquirerFactory. virtual SecurityLevel3::CredentialsAcquirer_ptr make ( TAO::SL3::CredentialsCurator_ptr curator, - const CORBA::Any & acquisition_arguments - ACE_ENV_ARG_DECL) = 0; + const CORBA::Any & acquisition_arguments) = 0; }; diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp index d9b4e0db1b2..612b818c930 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.cpp @@ -62,8 +62,7 @@ TAO::SL3::CredentialsCurator::_duplicate (TAO::SL3::CredentialsCurator_ptr obj) } TAO::SL3::CredentialsCurator_ptr -TAO::SL3::CredentialsCurator::_narrow (CORBA::Object_ptr obj - ACE_ENV_ARG_DECL_NOT_USED) +TAO::SL3::CredentialsCurator::_narrow (CORBA::Object_ptr obj) { return TAO::SL3::CredentialsCurator::_duplicate ( dynamic_cast<TAO::SL3::CredentialsCurator *> (obj)); @@ -108,8 +107,7 @@ TAO::SL3::CredentialsCurator::supported_methods (void) SecurityLevel3::CredentialsAcquirer_ptr TAO::SL3::CredentialsCurator::acquire_credentials ( const char * acquisition_method, - const CORBA::Any & acquisition_arguments - ACE_ENV_ARG_DECL) + const CORBA::Any & acquisition_arguments) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO::SL3::CredentialsAcquirerFactory * factory; @@ -118,8 +116,7 @@ TAO::SL3::CredentialsCurator::acquire_credentials ( factory) == 0) { return factory->make (this, - acquisition_arguments - ACE_ENV_ARG_PARAMETER); + acquisition_arguments); } ACE_THROW_RETURN (CORBA::BAD_PARAM (), @@ -191,8 +188,7 @@ TAO::SL3::CredentialsCurator::default_creds_ids (void) SecurityLevel3::OwnCredentials_ptr TAO::SL3::CredentialsCurator::get_own_credentials ( - const char * credentials_id - ACE_ENV_ARG_DECL_NOT_USED) + const char * credentials_id) ACE_THROW_SPEC ((CORBA::SystemException)) { Credentials_Table::ENTRY * entry; @@ -213,8 +209,7 @@ TAO::SL3::CredentialsCurator::get_own_credentials ( void TAO::SL3::CredentialsCurator::release_own_credentials ( - const char * credentials_id - ACE_ENV_ARG_DECL_NOT_USED) + const char * credentials_id) ACE_THROW_SPEC ((CORBA::SystemException)) { Credentials_Table::ENTRY * entry; @@ -233,11 +228,10 @@ TAO::SL3::CredentialsCurator::release_own_credentials ( void TAO::SL3::CredentialsCurator:: register_acquirer_factory ( const char * acquisition_method, - TAO::SL3::CredentialsAcquirerFactory * factory - ACE_ENV_ARG_DECL) + TAO::SL3::CredentialsAcquirerFactory * factory) { if (acquisition_method == 0 || factory == 0) - ACE_THROW (CORBA::BAD_PARAM ()); + throw CORBA::BAD_PARAM (); CORBA::String_var method = CORBA::string_dup (acquisition_method); @@ -247,9 +241,9 @@ TAO::SL3::CredentialsCurator:: register_acquirer_factory ( this->acquirer_factories_.bind (method.in (), factory); if (result == 1) // Entry already exists in table. - ACE_THROW (CORBA::BAD_INV_ORDER ()); + throw CORBA::BAD_INV_ORDER (); else if (result == -1) // Failure. - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); // CredentialsCurator now owns the acquisition method id. @@ -260,8 +254,7 @@ TAO::SL3::CredentialsCurator:: register_acquirer_factory ( void TAO::SL3::CredentialsCurator::_tao_add_own_credentials ( - SecurityLevel3::OwnCredentials_ptr credentials - ACE_ENV_ARG_DECL) + SecurityLevel3::OwnCredentials_ptr credentials) { CORBA::String_var credentials_id = credentials->creds_id (); @@ -272,7 +265,7 @@ TAO::SL3::CredentialsCurator::_tao_add_own_credentials ( if (this->credentials_table_.bind (credentials_id.in (), creds) != 0) { - ACE_THROW (CORBA::NO_RESOURCES ()); + throw CORBA::NO_RESOURCES (); } // CredentialsCurator nows owns the id. diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h index 85edccb3963..db6523f2948 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_CredentialsCurator.h @@ -87,8 +87,7 @@ namespace TAO static CredentialsCurator_ptr _duplicate (CredentialsCurator_ptr obj); static CredentialsCurator_ptr _nil (void); - static CredentialsCurator_ptr _narrow (CORBA::Object_ptr obj - ACE_ENV_ARG_DECL); + static CredentialsCurator_ptr _narrow (CORBA::Object_ptr obj); /** * @name SecurityLevel3::CredentialsCurator Methods @@ -97,31 +96,25 @@ namespace TAO * interface. */ //@{ - virtual SecurityLevel3::AcquisitionMethodList * supported_methods ( - ACE_ENV_SINGLE_ARG_DECL) + virtual SecurityLevel3::AcquisitionMethodList * supported_methods () ACE_THROW_SPEC ((CORBA::SystemException)); virtual SecurityLevel3::CredentialsAcquirer_ptr acquire_credentials ( const char * acquisition_method, - const CORBA::Any & acquisition_arguments - ACE_ENV_ARG_DECL) + const CORBA::Any & acquisition_arguments) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual SecurityLevel3::OwnCredentialsList * default_creds_list ( - ACE_ENV_SINGLE_ARG_DECL) + virtual SecurityLevel3::OwnCredentialsList * default_creds_list () ACE_THROW_SPEC ((CORBA::SystemException)); - virtual SecurityLevel3::CredentialsIdList * default_creds_ids ( - ACE_ENV_SINGLE_ARG_DECL) + virtual SecurityLevel3::CredentialsIdList * default_creds_ids () ACE_THROW_SPEC ((CORBA::SystemException)); virtual SecurityLevel3::OwnCredentials_ptr get_own_credentials ( - const char * credentials_id - ACE_ENV_ARG_DECL) + const char * credentials_id) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void release_own_credentials (const char * credentials_id - ACE_ENV_ARG_DECL) + virtual void release_own_credentials (const char * credentials_id) ACE_THROW_SPEC ((CORBA::SystemException)); //@} @@ -132,14 +125,12 @@ namespace TAO */ void register_acquirer_factory ( const char * acquisition_method, - TAO::SL3::CredentialsAcquirerFactory * factory - ACE_ENV_ARG_DECL); + TAO::SL3::CredentialsAcquirerFactory * factory); /// TAO-specific means of adding credentials to this /// CredentialsCurator's "own credentials" list. void _tao_add_own_credentials ( - SecurityLevel3::OwnCredentials_ptr credentials - ACE_ENV_ARG_DECL); + SecurityLevel3::OwnCredentials_ptr credentials); protected: diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp index 3088ce32014..96f517b894a 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.cpp @@ -34,8 +34,7 @@ TAO::SL3::ObjectCredentialsPolicy::creds_list (void) } CORBA::PolicyType -TAO::SL3::ObjectCredentialsPolicy::policy_type ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO::SL3::ObjectCredentialsPolicy::policy_type () ACE_THROW_SPEC ((CORBA::SystemException)) { return SecurityLevel3::ObjectCredentialsPolicyType; diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h index 37a3dfd6ecb..03741cd8e89 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_ObjectCredentialsPolicy.h @@ -65,8 +65,7 @@ namespace TAO * SecurityLevel3::ObjectCredentialsPolicy interface. */ //@{ - virtual SecurityLevel3::OwnCredentialsList * creds_list ( - ACE_ENV_SINGLE_ARG_DECL) + virtual SecurityLevel3::OwnCredentialsList * creds_list () ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::PolicyType policy_type (void) diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp index 8fc5eec666e..ecc4c6b6513 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.cpp @@ -14,8 +14,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Policy_ptr TAO::SL3::PolicyFactory::create_policy (CORBA::PolicyType type, - const CORBA::Any & value - ACE_ENV_ARG_DECL) + const CORBA::Any & value) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)) { diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h index 9c3a36b0913..e770e7d697b 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_PolicyFactory.h @@ -61,8 +61,7 @@ namespace TAO /// Construct a Test::Policy object as a test. virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, - const CORBA::Any & value - ACE_ENV_ARG_DECL) + const CORBA::Any & value) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)); diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h index b995b51cd25..ee33fdb8452 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent.h @@ -69,8 +69,7 @@ namespace TAO * interface. */ //@{ - virtual SecurityLevel3::ClientCredentials_ptr client_credentials ( - ACE_ENV_SINGLE_ARG_DECL) + virtual SecurityLevel3::ClientCredentials_ptr client_credentials () ACE_THROW_SPEC ((CORBA::SystemException)); virtual CORBA::Boolean request_is_local (void) diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h index 59501c69339..ab07794ba60 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityCurrent_Impl.h @@ -60,13 +60,11 @@ namespace TAO //@{ /// Return the Credentials received from the client associate with /// the current request. - virtual SecurityLevel3::ClientCredentials_ptr client_credentials ( - ACE_ENV_SINGLE_ARG_DECL) + virtual SecurityLevel3::ClientCredentials_ptr client_credentials () ACE_THROW_SPEC ((CORBA::SystemException)) = 0; /// Is the current request local? - virtual CORBA::Boolean request_is_local ( - ACE_ENV_SINGLE_ARG_DECL) + virtual CORBA::Boolean request_is_local () ACE_THROW_SPEC ((CORBA::SystemException)) = 0; //@} diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp index d675bbb17c3..033908152ec 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.cpp @@ -23,8 +23,7 @@ TAO::SL3::SecurityManager::~SecurityManager (void) } SecurityLevel3::CredentialsCurator_ptr -TAO::SL3::SecurityManager::credentials_curator ( - ACE_ENV_SINGLE_ARG_DECL_NOT_USED) +TAO::SL3::SecurityManager::credentials_curator () ACE_THROW_SPEC ((CORBA::SystemException)) { return @@ -33,8 +32,7 @@ TAO::SL3::SecurityManager::credentials_curator ( } SecurityLevel3::TargetCredentials_ptr -TAO::SL3::SecurityManager::get_target_credentials (CORBA::Object_ptr /* the_object */ - ACE_ENV_ARG_DECL) +TAO::SL3::SecurityManager::get_target_credentials (CORBA::Object_ptr /* the_object */) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), @@ -48,8 +46,7 @@ TAO::SL3::SecurityManager::create_context_estab_policy ( SecurityLevel3::FeatureDirective use_client_auth, SecurityLevel3::FeatureDirective use_target_auth, SecurityLevel3::FeatureDirective use_confidentiality, - SecurityLevel3::FeatureDirective use_integrity - ACE_ENV_ARG_DECL) + SecurityLevel3::FeatureDirective use_integrity) ACE_THROW_SPEC ((CORBA::SystemException)) { SecurityLevel3::ContextEstablishmentPolicy_ptr policy; @@ -67,8 +64,7 @@ TAO::SL3::SecurityManager::create_context_estab_policy ( SecurityLevel3::ObjectCredentialsPolicy_ptr TAO::SL3::SecurityManager::create_object_creds_policy ( - const SecurityLevel3::OwnCredentialsList & creds_list - ACE_ENV_ARG_DECL) + const SecurityLevel3::OwnCredentialsList & creds_list) ACE_THROW_SPEC ((CORBA::SystemException)) { SecurityLevel3::ObjectCredentialsPolicy_ptr policy; diff --git a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h index 3f1ac2054ae..716345d94ed 100644 --- a/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h +++ b/TAO/orbsvcs/orbsvcs/Security/SL3_SecurityManager.h @@ -60,13 +60,11 @@ namespace TAO * interface. */ //@{ - virtual SecurityLevel3::CredentialsCurator_ptr credentials_curator ( - ACE_ENV_SINGLE_ARG_DECL) + virtual SecurityLevel3::CredentialsCurator_ptr credentials_curator () ACE_THROW_SPEC ((CORBA::SystemException)); virtual SecurityLevel3::TargetCredentials_ptr get_target_credentials ( - CORBA::Object_ptr the_object - ACE_ENV_ARG_DECL) + CORBA::Object_ptr the_object) ACE_THROW_SPEC ((CORBA::SystemException)); virtual SecurityLevel3::ContextEstablishmentPolicy_ptr @@ -76,14 +74,12 @@ namespace TAO SecurityLevel3::FeatureDirective use_client_auth, SecurityLevel3::FeatureDirective use_target_auth, SecurityLevel3::FeatureDirective use_confidentiality, - SecurityLevel3::FeatureDirective use_integrity - ACE_ENV_ARG_DECL) + SecurityLevel3::FeatureDirective use_integrity) ACE_THROW_SPEC ((CORBA::SystemException)); virtual SecurityLevel3::ObjectCredentialsPolicy_ptr create_object_creds_policy ( - const SecurityLevel3::OwnCredentialsList & cred_list - ACE_ENV_ARG_DECL) + const SecurityLevel3::OwnCredentialsList & cred_list) ACE_THROW_SPEC ((CORBA::SystemException)); //@} diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp index 7e0edc5be59..cfdc4a541eb 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.cpp @@ -27,8 +27,7 @@ TAO_Security_Current::~TAO_Security_Current (void) Security::AttributeList * TAO_Security_Current::get_attributes ( - const Security::AttributeTypeList &attributes - ACE_ENV_ARG_DECL) + const Security::AttributeTypeList &attributes) ACE_THROW_SPEC ((CORBA::SystemException)) { TAO::Security::Current_Impl *impl = this->implementation (); @@ -39,12 +38,11 @@ TAO_Security_Current::get_attributes ( if (impl == 0) ACE_THROW_RETURN (CORBA::BAD_INV_ORDER (), 0); - return impl->get_attributes (attributes ACE_ENV_ARG_PARAMETER); + return impl->get_attributes (attributes); } SecurityLevel2::ReceivedCredentials_ptr -TAO_Security_Current::received_credentials ( - ACE_ENV_SINGLE_ARG_DECL) +TAO_Security_Current::received_credentials () ACE_THROW_SPEC ((CORBA::SystemException)) { TAO::Security::Current_Impl *impl = this->implementation (); @@ -63,15 +61,13 @@ TAO_Security_Current::init (void) { int result = 0; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { int argc = 0; char **argv = 0; CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, - this->orb_id_.in () - ACE_ENV_ARG_PARAMETER); + this->orb_id_.in ()); this->orb_core_ = orb.in ()->orb_core (); @@ -79,15 +75,14 @@ TAO_Security_Current::init (void) // occupying. (void) this->orb_id_.out (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { if (TAO_debug_level >= 1) - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, + ACE_PRINT_EXCEPTION (ex, "Could not initialize SecurityCurrent:"); result = -1; } - ACE_ENDTRY; return result; } diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h index 118689ca9d4..eeed650d20b 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current.h @@ -63,8 +63,7 @@ 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 - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const Security::AttributeTypeList & attributes) ACE_THROW_SPEC ((CORBA::SystemException)); //@} @@ -77,8 +76,7 @@ public: //@{ /// Return the Credentials received from the client associate with /// the current request. - virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials ( - ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS) + virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials () 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 f92e121fddf..a0cfbaccbee 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_Current_Impl.h @@ -61,8 +61,7 @@ namespace TAO /// the given attribute type list associated with the current /// request. virtual ::Security::AttributeList * get_attributes ( - const ::Security::AttributeTypeList & attributes - ACE_ENV_ARG_DECL) + const ::Security::AttributeTypeList & attributes) ACE_THROW_SPEC ((CORBA::SystemException)) = 0; //@} @@ -75,8 +74,7 @@ namespace TAO //@{ /// Return the Credentials received from the client associate with /// the current request. - virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials ( - ACE_ENV_SINGLE_ARG_DECL) + virtual SecurityLevel2::ReceivedCredentials_ptr received_credentials () 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 f735c30dcbf..e7830c498cc 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.cpp @@ -22,15 +22,13 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL void TAO::Security::ORBInitializer::pre_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { // 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_ENV_ARG_PARAMETER); + TAO_ORBInitInfo::_narrow (info); if (CORBA::is_nil (tao_info.in ())) { @@ -41,13 +39,13 @@ TAO::Security::ORBInitializer::pre_init ( "\"PortableInterceptor::ORBInitInfo_ptr\" to\n" "(%P|%t) \"TAO_ORBInitInfo_ptr.\"\n")); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } // // Reserve a TSS slot in the ORB core internal TSS resources for the // // thread-specific portion of Security::Current. // size_t old_tss_slot = tao_info->allocate_tss_slot_id (0 -// ACE_ENV_ARG_PARAMETER); +//); // CORBA::String_var orb_id = info->orb_id (); @@ -67,13 +65,12 @@ TAO::Security::ORBInitializer::pre_init ( // // ORB. // info->register_initial_reference ("SecurityCurrent", // security_current.in () -// ACE_ENV_ARG_PARAMETER); +//); // Reserve a TSS slot in the ORB core internal TSS resources for the // thread-specific portion of SecurityLevel3::SecurityCurrent // object. - size_t tss_slot = tao_info->allocate_tss_slot_id (0 - ACE_ENV_ARG_PARAMETER); + size_t tss_slot = tao_info->allocate_tss_slot_id (0); // Create the SecurityLevel3::Current object. @@ -92,8 +89,7 @@ TAO::Security::ORBInitializer::pre_init ( // Register the SecurityLevel2::Current object reference with the // ORB. info->register_initial_reference ("SecurityLevel3:SecurityCurrent", - security_current3.in () - ACE_ENV_ARG_PARAMETER); + security_current3.in ()); // Create the SecurityLevel3::CredentialsCurator object. SecurityLevel3::CredentialsCurator_ptr curator; @@ -110,8 +106,7 @@ TAO::Security::ORBInitializer::pre_init ( // Register the SecurityLevel3::CredentialsCurator object reference // with the ORB. info->register_initial_reference ("SecurityLevel3:CredentialsCurator", - credentials_curator.in () - ACE_ENV_ARG_PARAMETER); + credentials_curator.in ()); // Create the SecurityLevel3::SecurityManager object. SecurityLevel3::SecurityManager_ptr manager3; @@ -128,24 +123,20 @@ TAO::Security::ORBInitializer::pre_init ( // Register the SecurityLevel3::SecurityManager object reference // with the ORB. info->register_initial_reference ("SecurityLevel3:SecurityManager", - security_manager3.in () - ACE_ENV_ARG_PARAMETER); + security_manager3.in ()); } void TAO::Security::ORBInitializer::post_init ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->register_policy_factories (info - ACE_ENV_ARG_PARAMETER); + this->register_policy_factories (info); } void TAO::Security::ORBInitializer::register_policy_factories ( - PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL) + PortableInterceptor::ORBInitInfo_ptr info) { // Register the security policy factories. @@ -171,45 +162,37 @@ TAO::Security::ORBInitializer::register_policy_factories ( type = ::Security::SecQOPPolicy; info->register_policy_factory (type, - this->policy_factory_.in () - ACE_ENV_ARG_PARAMETER); + this->policy_factory_.in ()); type = ::Security::SecMechanismsPolicy; info->register_policy_factory (type, - this->policy_factory_.in () - ACE_ENV_ARG_PARAMETER); + this->policy_factory_.in ()); type = ::Security::SecInvocationCredentialsPolicy; info->register_policy_factory (type, - this->policy_factory_.in () - ACE_ENV_ARG_PARAMETER); + this->policy_factory_.in ()); type = ::Security::SecFeaturePolicy; // Deprecated info->register_policy_factory (type, - this->policy_factory_.in () - ACE_ENV_ARG_PARAMETER); + this->policy_factory_.in ()); type = ::Security::SecDelegationDirectivePolicy; info->register_policy_factory (type, - this->policy_factory_.in () - ACE_ENV_ARG_PARAMETER); + this->policy_factory_.in ()); type = ::Security::SecEstablishTrustPolicy; info->register_policy_factory (type, - this->policy_factory_.in () - ACE_ENV_ARG_PARAMETER); + this->policy_factory_.in ()); type = SecurityLevel3::ContextEstablishmentPolicyType; info->register_policy_factory (type, - this->policy_factory_.in () - ACE_ENV_ARG_PARAMETER); + this->policy_factory_.in ()); type = SecurityLevel3::ObjectCredentialsPolicyType; info->register_policy_factory (type, - this->policy_factory_.in () - ACE_ENV_ARG_PARAMETER); + this->policy_factory_.in ()); // ---------------------------------------------------------------- diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h index c6a17685f4d..758b02e6227 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_ORBInitializer.h @@ -69,20 +69,17 @@ namespace TAO * interface. */ //@{ - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) ACE_THROW_SPEC ((CORBA::SystemException)); //@} private: /// Register Security policy factories. - void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info - ACE_ENV_ARG_DECL); + void register_policy_factories (PortableInterceptor::ORBInitInfo_ptr info); private: diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp index 624827950ef..cb91d9c18ec 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.cpp @@ -22,8 +22,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL CORBA::Policy_ptr TAO::Security::PolicyFactory::create_policy ( CORBA::PolicyType type, - const CORBA::Any &value - ACE_ENV_ARG_DECL) + const CORBA::Any &value) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)) { diff --git a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h index 4596caadcb3..9d460b2998b 100644 --- a/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h +++ b/TAO/orbsvcs/orbsvcs/Security/Security_PolicyFactory.h @@ -53,8 +53,7 @@ namespace TAO public: virtual CORBA::Policy_ptr create_policy (CORBA::PolicyType type, - const CORBA::Any & value - ACE_ENV_ARG_DECL_WITH_DEFAULTS) + const CORBA::Any & value) ACE_THROW_SPEC ((CORBA::SystemException, CORBA::PolicyError)); }; |