From a2285a78020ccef0599137ff6aa96d600a2f5a5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Love=20H=C3=B6rnquist=20=C3=85strand?= Date: Mon, 30 May 2005 20:51:51 +0000 Subject: [PATCH] export check_compat as _gss_check_compat git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15315 ec53bebd-3082-4978-b11e-865c3cabbd6b --- lib/gssapi/compat.c | 26 +++++++++++++------------- lib/gssapi/krb5/compat.c | 26 +++++++++++++------------- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/lib/gssapi/compat.c b/lib/gssapi/compat.c index c5cf4ab58..cc0f1150c 100644 --- a/lib/gssapi/compat.c +++ b/lib/gssapi/compat.c @@ -36,10 +36,10 @@ RCSID("$Id$"); -static krb5_error_code -check_compat(OM_uint32 *minor_status, gss_name_t name, - const char *option, krb5_boolean *compat, - krb5_boolean match_val) +krb5_error_code +_gss_check_compat(OM_uint32 *minor_status, gss_name_t name, + const char *option, krb5_boolean *compat, + krb5_boolean match_val) { krb5_error_code ret = 0; char **p, **q; @@ -70,7 +70,8 @@ check_compat(OM_uint32 *minor_status, gss_name_t name, krb5_config_free_strings(p); if (ret) { - *minor_status = ret; + if (minor_status) + *minor_status = ret; return GSS_S_FAILURE; } @@ -88,12 +89,12 @@ _gss_DES3_get_mic_compat(OM_uint32 *minor_status, gss_ctx_id_t ctx) OM_uint32 ret; if ((ctx->more_flags & COMPAT_OLD_DES3_SELECTED) == 0) { - ret = check_compat(minor_status, ctx->target, - "broken_des3_mic", &use_compat, TRUE); + ret = _gss_check_compat(minor_status, ctx->target, + "broken_des3_mic", &use_compat, TRUE); if (ret) return ret; - ret = check_compat(minor_status, ctx->target, - "correct_des3_mic", &use_compat, FALSE); + ret = _gss_check_compat(minor_status, ctx->target, + "correct_des3_mic", &use_compat, FALSE); if (ret) return ret; @@ -142,13 +143,12 @@ _gss_spnego_require_mechlist_mic(OM_uint32 *minor_status, *require_mic = TRUE; } else { *require_mic = FALSE; - ret = check_compat(minor_status, ctx->target, - "require_mechlist_mic", - require_mic, TRUE); + ret = _gss_check_compat(minor_status, ctx->target, + "require_mechlist_mic", + require_mic, TRUE); if (ret) return ret; } *minor_status = 0; return GSS_S_COMPLETE; } - diff --git a/lib/gssapi/krb5/compat.c b/lib/gssapi/krb5/compat.c index c5cf4ab58..cc0f1150c 100644 --- a/lib/gssapi/krb5/compat.c +++ b/lib/gssapi/krb5/compat.c @@ -36,10 +36,10 @@ RCSID("$Id$"); -static krb5_error_code -check_compat(OM_uint32 *minor_status, gss_name_t name, - const char *option, krb5_boolean *compat, - krb5_boolean match_val) +krb5_error_code +_gss_check_compat(OM_uint32 *minor_status, gss_name_t name, + const char *option, krb5_boolean *compat, + krb5_boolean match_val) { krb5_error_code ret = 0; char **p, **q; @@ -70,7 +70,8 @@ check_compat(OM_uint32 *minor_status, gss_name_t name, krb5_config_free_strings(p); if (ret) { - *minor_status = ret; + if (minor_status) + *minor_status = ret; return GSS_S_FAILURE; } @@ -88,12 +89,12 @@ _gss_DES3_get_mic_compat(OM_uint32 *minor_status, gss_ctx_id_t ctx) OM_uint32 ret; if ((ctx->more_flags & COMPAT_OLD_DES3_SELECTED) == 0) { - ret = check_compat(minor_status, ctx->target, - "broken_des3_mic", &use_compat, TRUE); + ret = _gss_check_compat(minor_status, ctx->target, + "broken_des3_mic", &use_compat, TRUE); if (ret) return ret; - ret = check_compat(minor_status, ctx->target, - "correct_des3_mic", &use_compat, FALSE); + ret = _gss_check_compat(minor_status, ctx->target, + "correct_des3_mic", &use_compat, FALSE); if (ret) return ret; @@ -142,13 +143,12 @@ _gss_spnego_require_mechlist_mic(OM_uint32 *minor_status, *require_mic = TRUE; } else { *require_mic = FALSE; - ret = check_compat(minor_status, ctx->target, - "require_mechlist_mic", - require_mic, TRUE); + ret = _gss_check_compat(minor_status, ctx->target, + "require_mechlist_mic", + require_mic, TRUE); if (ret) return ret; } *minor_status = 0; return GSS_S_COMPLETE; } -