use shibresolver API properly

[mech_eap.orig] / util.h

diff --git a/util.h b/util.h
index 2429458..3b1305c 100644 (file)
--- a/util.h
+++ b/util.h
@@ -140,7 +140,7 @@ gssEapSign(krb5_context context,
 int
 gssEapVerify(krb5_context context,
              krb5_cksumtype type,
-             size_t rrc,  
+             size_t rrc,
              krb5_keyblock *key,
              krb5_keyusage sign_usage,
              gss_iov_buffer_desc *iov,
@@ -282,7 +282,7 @@ gssEapValidateMechs(OM_uint32 *minor,
 
 /* util_name.c */
 #define EXPORT_NAME_FLAG_OID        0x1
-#define EXPORT_NAME_FLAG_ATTRS      0x2
+#define EXPORT_NAME_FLAG_COMPOSITE  0x2
 
 OM_uint32 gssEapAllocName(OM_uint32 *minor, gss_name_t *pName);
 OM_uint32 gssEapReleaseName(OM_uint32 *minor, gss_name_t *pName);
@@ -307,7 +307,7 @@ OM_uint32
 composeOid(OM_uint32 *minor_status,
            const char *prefix,
            size_t prefix_len,
-           int suffix,  
+           int suffix,
            gss_OID_desc *oid);
 
 OM_uint32