[PATCH 0/1] MR2572: wldap32: Skip over the TLS certificate check if not using TLS.

[Alex Henrie (＠alexhenrie)]

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54772

I could have fixed this in merge request !2533 but unfortunately I was so focused on testing SSL connections that I didn't notice that non-SSL connections were still broken.

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

[PATCH 1/1] wldap32: Skip over the TLS certificate check if not using TLS.

[Alex Henrie]

From: Alex Henrie <alexhenrie24(a)gmail.com>

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=54772
---
 dlls/wldap32/init.c        | 20 ++++++++++----------
 dlls/wldap32/tests/parse.c |  2 ++
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/dlls/wldap32/init.c b/dlls/wldap32/init.c
index e68782add8d..f1fd33cd34e 100644
--- a/dlls/wldap32/init.c
+++ b/dlls/wldap32/init.c
@@ -271,17 +271,17 @@ ULONG CDECL WLDAP32_ldap_connect( LDAP *ld, struct l_timeval *timeout )
         if ((ret = ldap_get_option( CTX(ld), LDAP_OPT_X_TLS_SSL_CTX, &tls_context )))
             return map_error( ret );
 
-        if (QueryContextAttributesA( tls_context, SECPKG_ATTR_REMOTE_CERT_CONTEXT, &cert ) != SEC_E_OK)
-            return WLDAP32_LDAP_SERVER_DOWN;
-
-        if (cert_callback( ld, &cert ))
-        {
-            TRACE( "accepted\n" );
-        }
-        else
+        if (QueryContextAttributesA( tls_context, SECPKG_ATTR_REMOTE_CERT_CONTEXT, &cert ) == SEC_E_OK)
         {
-            WARN( "rejected\n" );
-            return WLDAP32_LDAP_SERVER_DOWN;
+            if (cert_callback( ld, &cert ))
+            {
+                TRACE( "accepted\n" );
+            }
+            else
+            {
+                WARN( "rejected\n" );
+                return WLDAP32_LDAP_SERVER_DOWN;
+            }
         }
     }
 
diff --git a/dlls/wldap32/tests/parse.c b/dlls/wldap32/tests/parse.c
index 15a24716305..995297cce10 100644
--- a/dlls/wldap32/tests/parse.c
+++ b/dlls/wldap32/tests/parse.c
@@ -586,6 +586,8 @@ static void test_opt_server_certificate(void)
     ok( !ret, "ldap_set_optionA should succeed, got %#lx\n", ret );
     ret = ldap_set_optionA( ld, LDAP_OPT_SERVER_CERTIFICATE, &verify_certificate );
     ok( !ret, "ldap_set_optionA should succeed, got %#lx\n", ret );
+    ret = ldap_connect( ld, NULL );
+    ok( !ret, "ldap_connect should succeed, got %#lx\n", ret );
     ret = ldap_start_tls_sA( ld, NULL, NULL, NULL, NULL );
     ok( ret == LDAP_LOCAL_ERROR, "ldap_start_tls_sA should fail, got %#lx\n", ret );
     ldap_unbind( ld );
-- 
GitLab

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

[PATCH 1/1] wldap32: Skip over the TLS certificate check if not using TLS.

[Marvin]

Hi,

It looks like your patch introduced the new failures shown below.
Please investigate and fix them before resubmitting your patch.
If they are not new, fixing them anyway would help a lot. Otherwise
please ask for the known failures list to be updated.

The tests also ran into some preexisting test failures. If you know how
to fix them that would be helpful. See the TestBot job for the details:

The full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=131446

Your paranoid android.


=== debian11 (32 bit report) ===

dinput:
device8.c:398: Test failed: 0x800: WaitForSingleObject returned 0x102
device8.c:403: Test failed: 0x800: got count 0
device8.c:418: Test failed: 0x800: WaitForSingleObject returned 0x102
device8.c:423: Test failed: 0x800: got count 0

[PATCH 0/1] MR2572: wldap32: Skip over the TLS certificate check if not using TLS. - approved

[Hans Leidekker (＠hans)]

This merge request was approved by Hans Leidekker.
-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/2572