diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-07-18 15:50:12 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-07-19 12:05:19 +0200 |
commit | abcb546269ab842fe701eed29be47e58d6c06601 (patch) | |
tree | 287d239a490aa387fc6e1b53c362fa93c6f68820 | |
parent | 1003f9f14d83eac9c08a219fa7d8140550de02c7 (diff) |
missing LDAP
since...
Make LDAP support optional
commit 6776c53b7ce2e431d8636f4e5a755f50f787ec8f
Date: Tue Jan 8 04:53:51 2019 -0500
Change-Id: I4268169809b0dc68b347b28523500453394937de
Reviewed-on: https://gerrit.libreoffice.org/75865
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | config_host.mk.in | 1 | ||||
-rw-r--r-- | extensions/Library_ldapbe2.mk | 1 | ||||
-rw-r--r-- | extensions/source/config/ldap/ldapuserprofilebe.cxx | 6 |
3 files changed, 6 insertions, 2 deletions
diff --git a/config_host.mk.in b/config_host.mk.in index 9bde2ff2a214..28d3ae3d2626 100644 --- a/config_host.mk.in +++ b/config_host.mk.in @@ -147,6 +147,7 @@ export DISABLE_GUI=@DISABLE_GUI@ export ENABLE_HTMLHELP=@ENABLE_HTMLHELP@ export ENABLE_IOS_LIBREOFFICELIGHT_APP=@ENABLE_IOS_LIBREOFFICELIGHT_APP@ export ENABLE_JAVA=@ENABLE_JAVA@ +export ENABLE_LDAP=@ENABLE_LDAP@ export ENABLE_LPSOLVE=@ENABLE_LPSOLVE@ export ENABLE_LTO=@ENABLE_LTO@ export ENABLE_LWP=@ENABLE_LWP@ diff --git a/extensions/Library_ldapbe2.mk b/extensions/Library_ldapbe2.mk index 5ea5a9597101..e76dcc21a5dd 100644 --- a/extensions/Library_ldapbe2.mk +++ b/extensions/Library_ldapbe2.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,ldapbe2,\ cppu \ salhelper \ sal \ + tl \ )) ifeq ($(OS),WNT) diff --git a/extensions/source/config/ldap/ldapuserprofilebe.cxx b/extensions/source/config/ldap/ldapuserprofilebe.cxx index cbf04fd6b027..9e5460b7b5fd 100644 --- a/extensions/source/config/ldap/ldapuserprofilebe.cxx +++ b/extensions/source/config/ldap/ldapuserprofilebe.cxx @@ -26,6 +26,7 @@ #include <rtl/ustrbuf.hxx> #include <rtl/byteseq.h> #include <sal/log.hxx> +#include <tools/diagnose_ex.h> #include <rtl/instance.hxx> #include <com/sun/star/beans/NamedValue.hpp> @@ -138,9 +139,10 @@ bool LdapUserProfileBe::readLdapConfiguration( getLdapStringParam(xAccess, kUser, definition->mAnonUser); getLdapStringParam(xAccess, kPassword, definition->mAnonCredentials); } - catch (const uno::Exception & e) + catch (const uno::Exception&) { - SAL_WARN("extensions.config", "LdapUserProfileBackend: access to configuration data failed: " << e); + css::uno::Any ex(DbgGetCaughtException()); + SAL_WARN("extensions.config", "LdapUserProfileBackend: access to configuration data failed: " << exceptionToString(ex)); return false; } |