diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-03-12 11:53:37 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-03-12 11:54:27 +0100 |
| commit | 6a94909b44126428133e87033959c94ead3f16b4 (patch) | |
| tree | 03892c0ff738fa53da53d47851a959f5e89b4999 /extensions | |
| parent | 25292b154ecfb33450307357f006b652cd673967 (diff) | |
Fix WITH_OPENLDAP case
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/config/ldap/ldapaccess.cxx | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/extensions/source/config/ldap/ldapaccess.cxx b/extensions/source/config/ldap/ldapaccess.cxx index 681c33c40553..c1d07ed3ab8a 100644 --- a/extensions/source/config/ldap/ldapaccess.cxx +++ b/extensions/source/config/ldap/ldapaccess.cxx @@ -273,26 +273,28 @@ void LdapConnection::initConnection() return userDn ; } +#if defined WNT || !defined WITH_OPENLDAP extern "C" { static void SAL_CALL thisModule() {} } +#endif + void LdapConnection::loadModule() { if ( !s_Ldap_Module ) { -#if defined(WNT) -# define LIBLDAP "nsldap32v50.dll" +#if defined WNT + s_Ldap_Module = osl_loadModuleRelativeAscii( + &thisModule, "nsldap32v50.dll", 0); +#elif defined WITH_OPENLDAP + s_Ldap_Module = osl_loadModuleAscii( + ("libldap-" SAL_STRINGIFY(LDAP_VENDOR_VERSION_MAJOR) "." + SAL_STRINGIFY(LDAP_VENDOR_VERSION_MINOR) ".so." + SAL_STRINGIFY(LDAP_VENDOR_VERSION_MAJOR)), + 0); #else -# ifdef WITH_OPENLDAP -# define xstr(s) str(s) -# define str(s) #s -# define LIBLDAP "libldap-" xstr(LDAP_VENDOR_VERSION_MAJOR) "." xstr(LDAP_VENDOR_VERSION_MINOR) ".so." xstr(LDAP_VENDOR_VERSION_MAJOR) -# else -# define LIBLDAP "libldap50.so" -# endif + s_Ldap_Module = osl_loadModuleRelativeAscii( + &thisModule, "libldap50.so", 0); #endif - const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM(LIBLDAP)); - // load the dbtools library - s_Ldap_Module = osl_loadModuleRelative(&thisModule, sModuleName.pData, 0); if ( s_Ldap_Module != NULL ) { s_p_unbind_s = (t_ldap_unbind_s)(osl_getFunctionSymbol(s_Ldap_Module, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ldap_unbind_s")).pData)); |