oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

export check_compat as _gss_check_compat

Browse Source 
git-svn-id: svn://svn.h5l.se/heimdal/trunk/heimdal@15315 ec53bebd-3082-4978-b11e-865c3cabbd6b
This commit is contained in:
Love Hörnquist Åstrand
2005-05-30 20:51:51 +00:00
parent 3471204c15
commit a2285a7802
2 changed files with 26 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
lib/gssapi/compat.c
View File

@@ -36,10 +36,10 @@
RCSID("$Id$"); RCSID("$Id$");
static krb5_error_code krb5_error_code
check_compat(OM_uint32 *minor_status, gss_name_t name, _gss_check_compat(OM_uint32 *minor_status, gss_name_t name,
const char *option, krb5_boolean *compat, const char *option, krb5_boolean *compat,
krb5_boolean match_val) krb5_boolean match_val)
{ {
krb5_error_code ret = 0; krb5_error_code ret = 0;
char **p, **q; char **p, **q;
@@ -70,7 +70,8 @@ check_compat(OM_uint32 *minor_status, gss_name_t name,
krb5_config_free_strings(p); krb5_config_free_strings(p);
if (ret) { if (ret) {
*minor_status = ret; if (minor_status)
*minor_status = ret;
return GSS_S_FAILURE; 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; OM_uint32 ret;
if ((ctx->more_flags & COMPAT_OLD_DES3_SELECTED) == 0) { if ((ctx->more_flags & COMPAT_OLD_DES3_SELECTED) == 0) {
ret = check_compat(minor_status, ctx->target, ret = _gss_check_compat(minor_status, ctx->target,
"broken_des3_mic", &use_compat, TRUE); "broken_des3_mic", &use_compat, TRUE);
if (ret) if (ret)
return ret; return ret;
ret = check_compat(minor_status, ctx->target, ret = _gss_check_compat(minor_status, ctx->target,
"correct_des3_mic", &use_compat, FALSE); "correct_des3_mic", &use_compat, FALSE);
if (ret) if (ret)
return ret; return ret;
@@ -142,13 +143,12 @@ _gss_spnego_require_mechlist_mic(OM_uint32 *minor_status,
*require_mic = TRUE; *require_mic = TRUE;
} else { } else {
*require_mic = FALSE; *require_mic = FALSE;
ret = check_compat(minor_status, ctx->target, ret = _gss_check_compat(minor_status, ctx->target,
"require_mechlist_mic", "require_mechlist_mic",
require_mic, TRUE); require_mic, TRUE);
if (ret) if (ret)
return ret; return ret;
} }
*minor_status = 0; *minor_status = 0;
return GSS_S_COMPLETE; return GSS_S_COMPLETE;
} }

26
lib/gssapi/krb5/compat.c
View File

@@ -36,10 +36,10 @@
RCSID("$Id$"); RCSID("$Id$");
static krb5_error_code krb5_error_code
check_compat(OM_uint32 *minor_status, gss_name_t name, _gss_check_compat(OM_uint32 *minor_status, gss_name_t name,
const char *option, krb5_boolean *compat, const char *option, krb5_boolean *compat,
krb5_boolean match_val) krb5_boolean match_val)
{ {
krb5_error_code ret = 0; krb5_error_code ret = 0;
char **p, **q; char **p, **q;
@@ -70,7 +70,8 @@ check_compat(OM_uint32 *minor_status, gss_name_t name,
krb5_config_free_strings(p); krb5_config_free_strings(p);
if (ret) { if (ret) {
*minor_status = ret; if (minor_status)
*minor_status = ret;
return GSS_S_FAILURE; 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; OM_uint32 ret;
if ((ctx->more_flags & COMPAT_OLD_DES3_SELECTED) == 0) { if ((ctx->more_flags & COMPAT_OLD_DES3_SELECTED) == 0) {
ret = check_compat(minor_status, ctx->target, ret = _gss_check_compat(minor_status, ctx->target,
"broken_des3_mic", &use_compat, TRUE); "broken_des3_mic", &use_compat, TRUE);
if (ret) if (ret)
return ret; return ret;
ret = check_compat(minor_status, ctx->target, ret = _gss_check_compat(minor_status, ctx->target,
"correct_des3_mic", &use_compat, FALSE); "correct_des3_mic", &use_compat, FALSE);
if (ret) if (ret)
return ret; return ret;
@@ -142,13 +143,12 @@ _gss_spnego_require_mechlist_mic(OM_uint32 *minor_status,
*require_mic = TRUE; *require_mic = TRUE;
} else { } else {
*require_mic = FALSE; *require_mic = FALSE;
ret = check_compat(minor_status, ctx->target, ret = _gss_check_compat(minor_status, ctx->target,
"require_mechlist_mic", "require_mechlist_mic",
require_mic, TRUE); require_mic, TRUE);
if (ret) if (ret)
return ret; return ret;
} }
*minor_status = 0; *minor_status = 0;
return GSS_S_COMPLETE; return GSS_S_COMPLETE;
} }