[ooo-build-commit] patches/dev300

[Noel Power]

 patches/dev300/apply                 |    1 
 patches/dev300/openldap-i105016.diff |   45 +++++++++++++++++++++++++++++++++++
 2 files changed, 46 insertions(+)

New commits:
commit cb5e2860f78e673a57edc98e3a81aad58d2877f1
Author: Noel Power <noel.power at novell.com>
Date:   Tue Sep 15 13:46:25 2009 +0100

    add caolan's openldap patch ( i#105016 )
    
    * patches/dev300/apply: add i#105016 fix
    * patches/dev300/openldap-i105016.diff:

diff --git a/patches/dev300/apply b/patches/dev300/apply
index 1acf8ee..a31cd96 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -504,6 +504,7 @@ localize-pl-cygwin-paths.diff, tml
 # such directories if they exist on the server's host system.
 [ Fixes >= dev300-m58 ]
 win32-invalid-names.diff, n#277603, tml
+openldap-i105016.diff
 [ Fixes < dev300-m58 ]
 win32-invalid-names-m57.diff, n#277603, tml
 
diff --git a/patches/dev300/openldap-i105016.diff b/patches/dev300/openldap-i105016.diff
new file mode 100644
index 0000000..b899fab
--- /dev/null
+++ b/patches/dev300/openldap-i105016.diff
@@ -0,0 +1,45 @@
+Index: extensions/source/config/ldap/wrapldapinclude.hxx
+===================================================================
+--- extensions/source/config/ldap/wrapldapinclude.hxx	(revision 276155)
++++ extensions/source/config/ldap/wrapldapinclude.hxx	(working copy)
+@@ -35,6 +35,12 @@
+ 
+ #ifdef WITH_OPENLDAP
+ #include <ldap.h>
++#ifndef LDAP_API
++#    define LDAP_API(rt) rt
++#endif
++#ifndef LDAP_CALL
++#    define LDAP_CALL
++#endif
+ #else
+ #ifndef LDAP_INCLUDED
+ #define LDAP_INCLUDED
+Index: extensions/source/config/ldap/ldapaccess.cxx
+===================================================================
+--- extensions/source/config/ldap/ldapaccess.cxx	(revision 276155)
++++ extensions/source/config/ldap/ldapaccess.cxx	(working copy)
+@@ -315,14 +315,17 @@
+     if ( !s_Ldap_Module )
+     {
+ #if defined(WIN) || defined(WNT)
+-        const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM("nsldap32v50.dll"));
++#       define LIBLDAP "nsldap32v50.dll"
+ #else
+-#ifdef WITH_OPENLDAP
+-        const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM("libldap.so"));
+-#else
+-        const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM("libldap50.so"));
++#   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
+ #endif
+-#endif
++        const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM(LIBLDAP));
+ 
+ 		// load the dbtools library
+ 		s_Ldap_Module = osl_loadModuleRelative(&thisModule, sModuleName.pData, 0);