Trying to use Windows LDAP for Windows builds

Change-Id: Ic06bda1393de4da05af01f79b8ba54cf0ee2cb73
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>

RepositoryExternal.mk

@@ -1368,12 +1368,6 @@ $(call gb_LinkTarget_use_libraries,$(1),\
 	ws2_32 \
 )
 
-ifeq ($(WITH_LDAP),YES)
-$(call gb_LinkTarget_add_libs,$(1),\
-	nsldap32v50.lib \
-)
-endif
-
 endif
 
 endef

connectivity/Library_postgresql-sdbc-impl.mk

@@ -46,6 +46,7 @@ $(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\
 ifeq ($(OS),WNT)
 $(eval $(call gb_Library_use_libraries,postgresql-sdbc-impl,\
 	shell32 \
+	wldap32 \
 ))
 
 ifeq ($(COM),MSC)

extensions/source/config/ldap/ldapaccess.cxx

@@ -283,7 +283,7 @@ void LdapConnection::loadModule()
     {
 #if defined WNT
         s_Ldap_Module = osl_loadModuleRelativeAscii(
-            &thisModule, "nsldap32v50.dll", 0);
+            &thisModule, "wldap32.dll", 0);
 #elif defined WITH_OPENLDAP
         s_Ldap_Module = osl_loadModuleAscii(
             ("libldap-" SAL_STRINGIFY(LDAP_VENDOR_VERSION_MAJOR) "."

extensions/source/config/ldap/wrapldapinclude.hxx

@@ -31,10 +31,24 @@
 #    define LDAP_CALL
 #endif
 #else
+#ifdef WNT
+#include <windows.h>
+#include <winldap.h>
+#ifndef LDAP_API
+#    define LDAP_API(rt) rt
+#endif
+#ifndef LDAP_CALL
+#    define LDAP_CALL
+#endif
+#ifndef LDAP_NO_ATTRS
+#    define LDAP_NO_ATTRS "1.1"
+#endif
+#else // !defined WNT
 #ifndef LDAP_INCLUDED
 #define LDAP_INCLUDED
 #include <ldap/ldap.h>
 #endif // LDAP_INCLUDED
+#endif // WNT
 #endif
 
 #ifdef WNT

postgresql/makefile.mk

@@ -60,8 +60,7 @@ BUILD_ACTION = nmake -f win32.mak USE_SSL=1
 .IF "$(WITH_LDAP)" == "YES"
 BUILD_ACTION += USE_LDAP=1
 .IF "$(WITH_OPENLDAP)" != "YES"
-SOLARINC += -I$(SOLARVER)$/$(INPATH)$/inc$/mozilla$/ldap
-BUILD_ACTION += USE_MOZLDAP=1
+BUILD_ACTION += USE_MICROSOFT_LDAP=1
 .ENDIF
 .ENDIF # "$(WITH_LDAP)" == "YES"
 .ELSE #"$(GUI)$(COM)"!="WNTMSC"

solenv/gbuild/platform/WNT_INTEL_GCC.mk

@@ -252,6 +252,7 @@ gb_Library_PLAINLIBS_NONE += \
 	version \
 	wininet \
 	winspool \
+	wldap32 \
 	ws2_32 \
 
 gb_Library_LAYER := \

solenv/gbuild/platform/WNT_INTEL_MSC.mk

@@ -423,6 +423,7 @@ gb_Library_PLAINLIBS_NONE += \
 	wininet \
 	winmm \
 	winspool \
+	wldap32 \
 	ws2_32 \
 
 gb_Library_LAYER := \

solenv/inc/libs.mk

@@ -112,7 +112,7 @@ MOZBASELIBST=$(STATIC) -lnspr4 -lxpcombase_s $(DYNAMIC)
 .ENDIF			# "$(GUI)$(COM)"=="WNTGCC"
 MOZBASELIB=-lnspr4 -lxpcom
 .IF "$(GUI)$(COM)"=="WNTGCC"
-LDAPSDKLIB=-lnsldap32v50
+LDAPSDKLIB=-lwldap32
 .ELSE			# "$(GUI)$(COM)"=="WNTGCC"
 .IF "$(WITH_OPENLDAP)" == "YES"
 LDAPSDKLIB=-lldap
@@ -412,7 +412,7 @@ EXTLIB=iext.lib
 SOTLIB=isot.lib
 MOZBASELIBST=nspr4_s.lib xpcombase_s.lib
 MOZBASELIB=nspr4.lib xpcom.lib
-LDAPSDKLIB=nsldap32v50.lib
+LDAPSDKLIB=wldap32.lib
 PAPILIB=ipap.lib
 SFX2LIB=sfx.lib
 SFXLIB=$(SFX2LIB)