strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

missing LDAP

Browse source 
since...

Make LDAP support optional
commit 6776c53b7c
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>
This commit is contained in:
Caolán McNamara 2019-07-18 15:50:12 +01:00
parent 1003f9f14d
commit abcb546269
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
config_host.mk.in
View file

@ -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@

1
extensions/Library_ldapbe2.mk
View file

@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,ldapbe2,\
cppu \
salhelper \
sal \
tl \
))
ifeq ($(OS),WNT)

6
extensions/source/config/ldap/ldapuserprofilebe.cxx
View file

@ -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;
}