[PATCH v2 0/1] MR4052: secur32/tests: Skip the tests instead of crashing if Kerberos is not supported.

[Francois Gouget (＠fgouget)]

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

--
  v2: secur32/tests: Skip the tests instead of crashing if Kerberos is not supported.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4052

[PATCH v2 1/1] secur32/tests: Skip the tests instead of crashing if Kerberos is not supported.

[Francois Gouget]

From: Francois Gouget <fgouget(a)codeweavers.com>

This avoids a crash when Wine is compiled using --without-krb5.
This makes test_ticket_cache() more consistent with test_kerberos().
---
Compiling Wine using --without-krb5 was meant to mimick the situation
on macOS (see bug 55555). But the latter gets failures, not a crash,
so it's not an exact match.
---
 dlls/secur32/tests/secur32.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/dlls/secur32/tests/secur32.c b/dlls/secur32/tests/secur32.c
index b1a1db76c3e..dd6eea095bf 100644
--- a/dlls/secur32/tests/secur32.c
+++ b/dlls/secur32/tests/secur32.c
@@ -446,7 +446,7 @@ static void test_kerberos(void)
 
 
     status = QuerySecurityPackageInfoA(provider, &info);
-    ok(status == SEC_E_OK, "Kerberos package not installed, skipping test\n");
+    ok(status == SEC_E_OK, "Kerberos package not installed (%08lx), skipping test\n", status);
     if(status != SEC_E_OK)
         return;
 
@@ -479,7 +479,12 @@ static void test_ticket_cache(void)
 
     RtlInitAnsiString( &name, MICROSOFT_KERBEROS_NAME_A );
     status = LsaLookupAuthenticationPackage( lsa, &name, &package );
-    ok( !status, "got %08lx\n", status );
+    ok(status == SEC_E_OK, "Kerberos package not installed (%08lx), skipping test\n", status);
+    if(status != SEC_E_OK)
+    {
+      LsaDeregisterLogonProcess( lsa );
+      return;
+    }
 
     status = LsaCallAuthenticationPackage( lsa, package, &req, sizeof(req), (void **)&resp, &len, &status );
     ok( !status, "got %08lx\n", status );
-- 
GitLab

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

[Francois Gouget (＠fgouget)]

v3: Make test_ticket_cache() fail and skip the tests the same way as test_kerberos(). Trace the error leading to the skip in both cases.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/4052#note_48502

[PATCH v2 0/1] MR4052: secur32/tests: Skip the tests instead of crashing if Kerberos is not supported. - approved

[Hans Leidekker (＠hans)]

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