[PATCH v2 0/2] MR7335: wldap32: Build libldap with debugging facilities turned on, enable tracing with +libldap channel.

[Dmitry Timoshkov (＠dmitry)]

--
  v2: wldap32: Don't use win32 constant when calling into libldap.
      wldap32: Enable libldap tracing with +wldap32 channel.

https://gitlab.winehq.org/wine/wine/-/merge_requests/7335

[PATCH v2 1/2] wldap32: Enable libldap tracing with +wldap32 channel.

[Dmitry Timoshkov]

From: Dmitry Timoshkov

Signed-off-by: Dmitry Timoshkov 
---
 dlls/wldap32/main.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/dlls/wldap32/main.c b/dlls/wldap32/main.c
index ac983372da7..5d5cf2527fb 100644
--- a/dlls/wldap32/main.c
+++ b/dlls/wldap32/main.c
@@ -24,6 +24,7 @@
 #include "winbase.h"

#include "wine/debug.h"
+#include "winldap_private.h"

HINSTANCE hwldap32;

@@ -38,6 +39,11 @@ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved )
     case DLL_PROCESS_ATTACH:
         hwldap32 = hinst;
         DisableThreadLibraryCalls( hinst );
+        if (TRACE_ON( wldap32 ))
+        {
+            int ld_debug = -1;
+            ldap_set_option( NULL, LDAP_OPT_DEBUG_LEVEL, &ld_debug );
+        }
         break;
     }
     return TRUE;

[PATCH v2 2/2] wldap32: Don't use win32 constant when calling into libldap.

[Dmitry Timoshkov]

From: Dmitry Timoshkov

Signed-off-by: Dmitry Timoshkov 
---
 dlls/wldap32/init.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/wldap32/init.c b/dlls/wldap32/init.c
index 472bf2ffdbf..d1329107c95 100644
--- a/dlls/wldap32/init.c
+++ b/dlls/wldap32/init.c
@@ -202,7 +202,7 @@ static LDAP *create_context( const char *url )
     if (!(ld = calloc( 1, sizeof( *ld )))) return NULL;
     if (map_error( ldap_initialize( &CTX(ld), url ) ) == WLDAP32_LDAP_SUCCESS)
     {
-        ldap_set_option( CTX(ld), WLDAP32_LDAP_OPT_PROTOCOL_VERSION, &version );
+        ldap_set_option( CTX(ld), LDAP_OPT_PROTOCOL_VERSION, &version );
         return ld;
     }
     free( ld );

[Dmitry Timoshkov (＠dmitry)]

On Fri Feb 14 14:03:47 2025 +0000, Hans Leidekker wrote:
> Our backend is not complete. We shouldn't depend on the flag not being implemented.

Fair enough.

[PATCH v2 0/2] MR7335: wldap32: Build libldap with debugging facilities turned on, enable tracing with +libldap channel. - approved

[Hans Leidekker (＠hans)]

This merge request was approved by Hans Leidekker.