From: Greg Hudson <ghudson@mit.edu>
Date: Wed, 18 Aug 2021 16:07:04 +0000 (-0400)
Subject: Fix conformance issue in GSSAPI tests
X-Git-Tag: krb5-1.20-beta1~64
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6fe25e755f510c0fc86b899d96db9f80acf03ac5;p=thirdparty%2Fkrb5.git

Fix conformance issue in GSSAPI tests

Although some C compilers allow a function returning void to be called
in a return statement from another function returning void, it isn't
conformant and generates an error from (at least) the HP-UX native
compiler.  Reported by Michael Osipov.

ticket: 9023 (new)
tags: pullup
target_version: 1.19-next
target_version: 1.18-next
---

diff --git a/src/tests/gssapi/common.c b/src/tests/gssapi/common.c
index b49c13d5d4..34f34f7a57 100644
--- a/src/tests/gssapi/common.c
+++ b/src/tests/gssapi/common.c
@@ -118,10 +118,9 @@ establish_contexts(gss_OID imech, gss_cred_id_t icred, gss_cred_id_t acred,
                    gss_ctx_id_t *actx, gss_name_t *src_name, gss_OID *amech,
                    gss_cred_id_t *deleg_cred)
 {
-    return establish_contexts_ex(imech, icred, acred, tname, flags, ictx, actx,
-                                 GSS_C_NO_CHANNEL_BINDINGS,
-                                 GSS_C_NO_CHANNEL_BINDINGS, NULL, src_name,
-                                 amech, deleg_cred);
+    establish_contexts_ex(imech, icred, acred, tname, flags, ictx, actx,
+                          GSS_C_NO_CHANNEL_BINDINGS, GSS_C_NO_CHANNEL_BINDINGS,
+                          NULL, src_name, amech, deleg_cred);
 }
 
 void