Merge branch 'master' into tlv-mic

[moonshot.git] / mech_eap / util.h

diff --git a/mech_eap/util.h b/mech_eap/util.h
index 9478cb6..e5376a6 100644 (file)
--- a/mech_eap/util.h
+++ b/mech_eap/util.h
@@ -356,9 +356,6 @@ rfc3961ChecksumTypeForKey(OM_uint32 *minor,
                           krb5_keyblock *key,
                           krb5_cksumtype *cksumtype);
 
-krb5_const_principal
-krbAnonymousPrincipal(void);
-
 krb5_error_code
 krbCryptoLength(krb5_context krbContext,
 #ifdef HAVE_HEIMDAL_VERSION
@@ -474,6 +471,7 @@ gssEapSaslNameToOid(const gss_buffer_t name);
 /* util_name.c */
 #define EXPORT_NAME_FLAG_OID                    0x1
 #define EXPORT_NAME_FLAG_COMPOSITE              0x2
+#define EXPORT_NAME_FLAG_ALLOW_COMPOSITE        0x4
 
 OM_uint32 gssEapAllocName(OM_uint32 *minor, gss_name_t *pName);
 OM_uint32 gssEapReleaseName(OM_uint32 *minor, gss_name_t *pName);