From 6576cfcbeaa981df7da186b6847bd63189d0d87a Mon Sep 17 00:00:00 2001 From: "Keith T. Garner" Date: Thu, 16 Dec 2010 18:17:40 +0000 Subject: [PATCH 1/4] Forgot to update the news for the 2.7.2 release. Oh well, better late than never git-svn-id: https://code.crt.realtors.org/svn/odbcretsdrv/ezrets/trunk@1388 fe7ac059-47f5-0310-8599-d0339b4e125c --- NEWS | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/NEWS b/NEWS index 7070c9d..5bf6fba 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,14 @@ +Changes since 2.7.1 +------------------- + Enhancement/BugFix + * For RETS servers doing SSL, ezRETS will not attempt to verify the + SSL certificate from the server. This behaviour will chance in + the future with some configuration options. + + Developer Notes + * Small fix to building on OS X where a library was linked + dynamically instead of staticly + Changes since 2.7.0 ------------------- Bug fix From 7356901dcda144799c4c37b530f77cad8bb6babe Mon Sep 17 00:00:00 2001 From: "Keith T. Garner" Date: Thu, 16 Dec 2010 19:51:09 +0000 Subject: [PATCH 2/4] Since I want to do this on every connection, I should really do this in DataSource git-svn-id: https://code.crt.realtors.org/svn/odbcretsdrv/ezrets/trunk@1390 fe7ac059-47f5-0310-8599-d0339b4e125c --- project/common/src/DataSource.cpp | 4 ++++ project/driver/src/RetsDBC.cpp | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/project/common/src/DataSource.cpp b/project/common/src/DataSource.cpp index 2c01c1a..4b1aa93 100644 --- a/project/common/src/DataSource.cpp +++ b/project/common/src/DataSource.cpp @@ -1085,6 +1085,10 @@ lr::RetsSessionPtr CLASS::CreateRetsSession() const session->SetProxy(mProxyUrl, mProxyPassword); } + // Until I have time to ship an SSL CA bundle, or configure a + // pointer to it, we'll be naughty and just not verify shit. + session->SetModeFlags(lr::RetsSession::MODE_NO_SSL_VERIFY); + return session; } diff --git a/project/driver/src/RetsDBC.cpp b/project/driver/src/RetsDBC.cpp index 2477a9d..3c91d8c 100644 --- a/project/driver/src/RetsDBC.cpp +++ b/project/driver/src/RetsDBC.cpp @@ -669,10 +669,6 @@ bool RetsDBC::login() session->SetHttpLogger(mRetsHttpLogger.get()); } - // Until I have time to ship an SSL CA bundle, or configure a - // pointer to it, we'll be naughty and just not verify shit. - session->SetModeFlags(lr::RetsSession::MODE_NO_SSL_VERIFY); - success = mDataSource.RetsLogin(session); if (success) { From 872ba211d001ee7881a945ba186bcf687cd09c33 Mon Sep 17 00:00:00 2001 From: "Keith T. Garner" Date: Mon, 17 Jan 2011 13:43:25 +0000 Subject: [PATCH 3/4] Use C++ casting methods to do the casting hopefully to allow Linux compile. git-svn-id: https://code.crt.realtors.org/svn/odbcretsdrv/ezrets/trunk@1391 fe7ac059-47f5-0310-8599-d0339b4e125c --- project/driver/src/RetsENV.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/project/driver/src/RetsENV.cpp b/project/driver/src/RetsENV.cpp index 98a243c..002f45d 100644 --- a/project/driver/src/RetsENV.cpp +++ b/project/driver/src/RetsENV.cpp @@ -21,6 +21,7 @@ #include "EzLogger.h" #include "StreamEzLogger.h" #include "str_stream.h" +#include /* Double casts such as: * foo = (SQLINTEGER) (SQLLEN) Value @@ -28,6 +29,7 @@ * we have in this file (and the others.) */ +namespace b = boost; using namespace odbcrets; RetsENV::RetsENV() : AbstractHandle(), mOdbcVersion(3) @@ -133,11 +135,11 @@ SQLRETURN RetsENV::SQLSetEnvAttr(SQLINTEGER Attribute, SQLPOINTER Value, switch (Attribute) { case SQL_ATTR_ODBC_VERSION: - mOdbcVersion = (SQLINTEGER) (SQLLEN) Value; + mOdbcVersion = b::numeric_cast(reinterpret_cast(Value)); break; case SQL_ATTR_OUTPUT_NTS: - if ((SQLINTEGER) (SQLLEN) Value == SQL_TRUE) + if (b::numeric_cast(reinterpret_cast(Value)) == SQL_TRUE) { break; } From 5a2208b2dbac9d929245c8d4500986ae52184a92 Mon Sep 17 00:00:00 2001 From: "Keith T. Garner" Date: Tue, 18 Jan 2011 19:21:21 +0000 Subject: [PATCH 4/4] Rollback the code that wasn't needed and fixed the real problem of the configure script missing checking the size of void* git-svn-id: https://code.crt.realtors.org/svn/odbcretsdrv/ezrets/trunk@1392 fe7ac059-47f5-0310-8599-d0339b4e125c --- configure.ac | 1 + project/driver/src/RetsENV.cpp | 6 ++---- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index d51dd13..a048993 100644 --- a/configure.ac +++ b/configure.ac @@ -30,6 +30,7 @@ if test -n "$GCC"; then fi dnl AC_PROG_LIBTOOL +AC_CHECK_SIZEOF(void*) AC_CHECK_SIZEOF(long) AC_CHECK_TYPES(long long) AC_CHECK_PROG(my_have_perl, perl, yes, no) diff --git a/project/driver/src/RetsENV.cpp b/project/driver/src/RetsENV.cpp index 002f45d..98a243c 100644 --- a/project/driver/src/RetsENV.cpp +++ b/project/driver/src/RetsENV.cpp @@ -21,7 +21,6 @@ #include "EzLogger.h" #include "StreamEzLogger.h" #include "str_stream.h" -#include /* Double casts such as: * foo = (SQLINTEGER) (SQLLEN) Value @@ -29,7 +28,6 @@ * we have in this file (and the others.) */ -namespace b = boost; using namespace odbcrets; RetsENV::RetsENV() : AbstractHandle(), mOdbcVersion(3) @@ -135,11 +133,11 @@ SQLRETURN RetsENV::SQLSetEnvAttr(SQLINTEGER Attribute, SQLPOINTER Value, switch (Attribute) { case SQL_ATTR_ODBC_VERSION: - mOdbcVersion = b::numeric_cast(reinterpret_cast(Value)); + mOdbcVersion = (SQLINTEGER) (SQLLEN) Value; break; case SQL_ATTR_OUTPUT_NTS: - if (b::numeric_cast(reinterpret_cast(Value)) == SQL_TRUE) + if ((SQLINTEGER) (SQLLEN) Value == SQL_TRUE) { break; }