From 2b144531f1a760514f217012e9dab01359b7a0d7 Mon Sep 17 00:00:00 2001 From: Andreas Schneider Date: Mon, 21 May 2012 18:25:28 +0200 Subject: gse: Use the smb_gss_oid_equal wrapper. Signed-off-by: Andreas Schneider --- source4/auth/gensec/gensec_gssapi.c | 6 ++++-- source4/auth/kerberos/kerberos.h | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'source4/auth') diff --git a/source4/auth/gensec/gensec_gssapi.c b/source4/auth/gensec/gensec_gssapi.c index 6d6ea3cf28..2b09665a44 100644 --- a/source4/auth/gensec/gensec_gssapi.c +++ b/source4/auth/gensec/gensec_gssapi.c @@ -612,7 +612,8 @@ static NTSTATUS gensec_gssapi_update(struct gensec_security *gensec_security, gssapi_error_string(out_mem_ctx, maj_stat, min_stat, gensec_gssapi_state->gss_oid))); } return NT_STATUS_INVALID_PARAMETER; - } else if (gss_oid_equal(gensec_gssapi_state->gss_oid, gss_mech_krb5)) { + } else if (smb_gss_oid_equal(gensec_gssapi_state->gss_oid, + gss_mech_krb5)) { switch (min_stat) { case KRB5KRB_AP_ERR_TKT_NYV: DEBUG(1, ("Error with ticket to contact %s: possible clock skew between us and the KDC or target server: %s\n", @@ -1225,7 +1226,8 @@ static bool gensec_gssapi_have_feature(struct gensec_security *gensec_security, } if (feature & GENSEC_FEATURE_SESSION_KEY) { /* Only for GSSAPI/Krb5 */ - if (gss_oid_equal(gensec_gssapi_state->gss_oid, gss_mech_krb5)) { + if (smb_gss_oid_equal(gensec_gssapi_state->gss_oid, + gss_mech_krb5)) { return true; } } diff --git a/source4/auth/kerberos/kerberos.h b/source4/auth/kerberos/kerberos.h index dd28e53413..0be6d74a8b 100644 --- a/source4/auth/kerberos/kerberos.h +++ b/source4/auth/kerberos/kerberos.h @@ -27,6 +27,7 @@ #include "auth/kerberos/krb5_init_context.h" #include "librpc/gen_ndr/krb5pac.h" #include "lib/krb5_wrap/krb5_samba.h" +#include "lib/krb5_wrap/gss_samba.h" struct auth_user_info_dc; struct cli_credentials; -- cgit