diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2004-03-29 07:47:08 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2004-03-29 07:47:08 +0000 |
| commit | 7be2f1f442d23eebed72961f652b6a4d37a368f7 (patch) | |
| tree | ae4d4281f6f89cc8a7a8d0ac52c0e20356acc7f9 | |
| parent | 1dbc3a51fb55226b6ed84902eefa1dfe4d6f190c (diff) | |
| download | ATCD-7be2f1f442d23eebed72961f652b6a4d37a368f7.tar.gz | |
Sun Mar 28 23:45:08 2004 Ossama Othman <ossama@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 27 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp | 24 |
2 files changed, 37 insertions, 14 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 60482039ef9..a1ea6e5afe2 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,4 +1,29 @@ -Thu Aug 7 1:51:27 2003 Ossama Othman <ossama@dre.vanderbilt.edu> +Sun Mar 28 23:45:08 2004 Ossama Othman <ossama@dre.vanderbilt.edu> + + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp (get_attributes): + + Improved "const correctness" in this method. + + (received_credentials): + + No need to assign TAO_SSLIOP_ReceivedCredentials instance to a + SecurityLevel2::ReceivedCredentials_var. Simply return + immediately instead. + +Wed Aug 13 23:03:39 2003 Ossama Othman <ossama@dre.vanderbilt.edu> + + * tao/IIOP_Factory.h: + * tao/IIOP_Factory.cpp: + * tao/Strategies/DIOP_Factory.h: + * tao/Strategies/DIOP_Factory.cpp: + * tao/Strategies/SHMIOP_Factory.h: + * tao/Strategies/SHMIOP_Factory.cpp: + * tao/Strategies/UIOP_Factory.h: + * tao/Strategies/UIOP_Factory.cpp: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.h: + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Factory.cpp: + + Removed unused "major_" and "minor_" members. * orbsvcs/orbsvcs/CSI.idl: * orbsvcs/orbsvcs/CSIIOP.idl: diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp index 2264ace46b3..dd38e75b307 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Current_Impl.cpp @@ -1,11 +1,11 @@ -// -*- C++ -*- - #include "SSLIOP_Current_Impl.h" -ACE_RCSID (TAO_SSLIOP, + +ACE_RCSID (SSLIOP, SSLIOP_Current_Impl, "$Id$") + #if !defined (__ACE_INLINE__) # include "SSLIOP_Current_Impl.inl" #endif /* __ACE_INLINE__ */ @@ -26,7 +26,7 @@ TAO_SSLIOP_Current_Impl::get_attributes ( ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - CORBA::ULong len = attributes.length (); + const CORBA::ULong len = attributes.length (); // A valid value must always be returned, so instantiate a sequence // regardless of whether or not it is populated. @@ -59,7 +59,7 @@ TAO_SSLIOP_Current_Impl::get_attributes ( && attribute.attribute_family.family == 1 // privileges && attribute.attribute_type == Security::AccessId) { - CORBA::ULong j = attribute_list->length (); + const CORBA::ULong j = attribute_list->length (); attribute_list->length (j + 1); // ---------------------------------------------------- @@ -99,7 +99,7 @@ TAO_SSLIOP_Current_Impl::get_attributes ( } // Get the size of the ASN.1 encoding. - int cert_length = ::i2d_X509 (cert.in (), 0); + const int cert_length = ::i2d_X509 (cert.in (), 0); if (cert_length <= 0) { // An error occurred, so do not include this attribute @@ -134,8 +134,8 @@ TAO_SSLIOP_Current_Impl::received_credentials ( ACE_THROW_RETURN (CORBA::BAD_OPERATION (), SecurityLevel2::ReceivedCredentials::_nil ()); - TAO_SSLIOP_ReceivedCredentials *c = 0; - ACE_NEW_THROW_EX (c, + SecurityLevel2::ReceivedCredentials_ptr creds; + ACE_NEW_THROW_EX (creds, TAO_SSLIOP_ReceivedCredentials (cert.in (), 0), CORBA::NO_MEMORY ( CORBA::SystemException::_tao_minor_code ( @@ -144,9 +144,7 @@ TAO_SSLIOP_Current_Impl::received_credentials ( CORBA::COMPLETED_NO)); ACE_CHECK_RETURN (SecurityLevel2::ReceivedCredentials::_nil ()); - SecurityLevel2::ReceivedCredentials_var creds = c; - - return creds._retn (); + return creds; } void @@ -161,7 +159,7 @@ TAO_SSLIOP_Current_Impl::get_peer_certificate ( return; // Get the size of the ASN.1 encoding. - int cert_length = ::i2d_X509 (cert.in (), 0); + const int cert_length = ::i2d_X509 (cert.in (), 0); if (cert_length <= 0) return; @@ -196,7 +194,7 @@ TAO_SSLIOP_Current_Impl::get_peer_certificate_chain ( X509 *x = sk_X509_value (certs, i); // Get the size of the ASN.1 encoding. - int cert_length = ::i2d_X509 (x, 0); + const int cert_length = ::i2d_X509 (x, 0); if (cert_length <= 0) continue; // @@ What do we do if there is an error? |