From 6fe25e755f510c0fc86b899d96db9f80acf03ac5 Mon Sep 17 00:00:00 2001 From: Greg Hudson Date: Wed, 18 Aug 2021 12:07:04 -0400 Subject: [PATCH] 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 --- src/tests/gssapi/common.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) 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 -- 2.47.2