diff options
author | Andreas Schneider <asn@samba.org> | 2012-05-21 18:25:28 +0200 |
---|---|---|
committer | Alexander Bokovoy <ab@samba.org> | 2012-05-23 17:51:51 +0300 |
commit | 2b144531f1a760514f217012e9dab01359b7a0d7 (patch) | |
tree | 0c9285cd0e52efff36d3bf700cbc9ccd918bcde1 /source4/auth | |
parent | 0a6e568344adb66e5f20ce61f106d791886fcb35 (diff) | |
download | samba-2b144531f1a760514f217012e9dab01359b7a0d7.tar.gz samba-2b144531f1a760514f217012e9dab01359b7a0d7.tar.bz2 samba-2b144531f1a760514f217012e9dab01359b7a0d7.zip |
gse: Use the smb_gss_oid_equal wrapper.
Signed-off-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'source4/auth')
-rw-r--r-- | source4/auth/gensec/gensec_gssapi.c | 6 | ||||
-rw-r--r-- | source4/auth/kerberos/kerberos.h | 1 |
2 files changed, 5 insertions, 2 deletions
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; |