krb5 commit: Fix conformance issue in GSSAPI tests

Greg Hudson ghudson at mit.edu
Mon Aug 23 12:15:03 EDT 2021


https://github.com/krb5/krb5/commit/6fe25e755f510c0fc86b899d96db9f80acf03ac5
commit 6fe25e755f510c0fc86b899d96db9f80acf03ac5
Author: Greg Hudson <ghudson at mit.edu>
Date:   Wed Aug 18 12:07:04 2021 -0400

    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 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/tests/gssapi/common.c b/src/tests/gssapi/common.c
index b49c13d..34f34f7 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


More information about the cvs-krb5 mailing list