connectivity/source/drivers/firebird/FConnection.cxx | 8 +++++++- connectivity/source/drivers/firebird/FPreparedStatement.cxx | 6 ++++-- 2 files changed, 11 insertions(+), 3 deletions(-)
New commits: commit 5226b42560e3965c23973ddaf157477f191fdbbb Author: Andrzej J.R. Hunt <andr...@ahunt.org> Date: Tue Jul 30 20:35:01 2013 +0200 Ignore authentication for embedded db (firebird-sdbc). This turns off firebird's internal SQL authentication -- previously tables were created and/or access validated using the current user's name leading to issues when a .odb file is shared amongst different users. Change-Id: I86615c17c3045aac19d635ee41d76673d1b64530 diff --git a/connectivity/source/drivers/firebird/FConnection.cxx b/connectivity/source/drivers/firebird/FConnection.cxx index c81d698..6fb8578 100644 --- a/connectivity/source/drivers/firebird/FConnection.cxx +++ b/connectivity/source/drivers/firebird/FConnection.cxx @@ -207,7 +207,13 @@ void OConnection::construct(const ::rtl::OUString& url, const Sequence< Property *dpb++ = FIREBIRD_SQL_DIALECT; // Do any more dpbBuffer additions here - if (!m_bIsEmbedded) // TODO: || m_bIsLocalFile + if (m_bIsEmbedded) // TODO: || m_bIsLocalFile + { + *dpb++ = isc_dpb_trusted_auth; + *dpb++ = 1; // Length of data + *dpb++ = 1; // TRUE + } + else { // TODO: parse password from connection string as needed? } commit 470daf5ce02924f31b7cb8a95c921427cfb4d277 Author: Andrzej J.R. Hunt <andr...@ahunt.org> Date: Tue Jul 30 17:05:13 2013 +0200 Add extra error check. (firebird-sdbc) Change-Id: Id342c01feddb9e0779afdc663ae019ea92a4517d diff --git a/connectivity/source/drivers/firebird/FPreparedStatement.cxx b/connectivity/source/drivers/firebird/FPreparedStatement.cxx index 4e05b92..441b86b 100644 --- a/connectivity/source/drivers/firebird/FPreparedStatement.cxx +++ b/connectivity/source/drivers/firebird/FPreparedStatement.cxx @@ -128,8 +128,10 @@ void OPreparedStatement::ensurePrepared() // m_nNumParams = isc_vax_integer(aResultBuffer+3, aVarLength); // } // } - mallocSQLVAR(m_pInSqlda); - evaluateStatusVector(m_statusVector, m_sSqlStatement, *this); + if (!aErr) + mallocSQLVAR(m_pInSqlda); + else + evaluateStatusVector(m_statusVector, m_sSqlStatement, *this); } OPreparedStatement::~OPreparedStatement() _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits