diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-05-23 18:17:15 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2003-05-23 18:17:15 +0000 |
| commit | dc4962439e05eb36c6a830562427783407160e28 (patch) | |
| tree | 773877da59fe1d5a6e3ffd50def62df4cbb5f877 | |
| parent | 9c01f76777f8f899934c8feea3a2071889f9b41d (diff) | |
| download | ATCD-dc4962439e05eb36c6a830562427783407160e28.tar.gz | |
ChangeLogTag:Fri May 23 11:16:31 2003 Ossama Othman <ossama@dre.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 4273f3db4b2..5cfe64d24db 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Fri May 23 11:16:31 2003 Ossama Othman <ossama@dre.vanderbilt.edu> + + From David Kinder <david.kinder@sophos.com> + * orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp (operator==): + + Fixed logic error in comparison of two TAO_SSLIOP_Credentials + objects. [Bug 1509] + Fri May 23 10:59:50 2003 Balachandran Natarajan <bala@dre.vanderbilt.edu> * tao/Valuetype_Adapter.h: Cleaned the interface to the ORB to diff --git a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp index b3da36787a7..d25f11429e0 100644 --- a/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp +++ b/TAO/orbsvcs/orbsvcs/SSLIOP/SSLIOP_Credentials.cpp @@ -399,10 +399,10 @@ TAO_SSLIOP_Credentials::operator== (const TAO_SSLIOP_Credentials &rhs) return this->accepting_options_supported_ == rhs.accepting_options_supported_ && this->accepting_options_required_ == rhs.accepting_options_required_ - && this->invocation_options_supported_ == invocation_options_supported_ - && this->invocation_options_required_ == this->invocation_options_required_ - && (xa != 0 && xb != 0 && ::X509_cmp (xa, xb) == 0) - // && (ea != 0 && eb != 0 && ::EVP_PKEY_cmp (ea, eb) == 0) + && this->invocation_options_supported_ == rhs.invocation_options_supported_ + && this->invocation_options_required_ == rhs.invocation_options_required_ + && ((xa == xb) || (xa != 0 && xb != 0 && ::X509_cmp (xa, xb) == 0)) + // && ((ea == eb) || (ea != 0 && eb != 0 && ::EVP_PKEY_cmp (ea, eb) == 0)) ; } |