projects
/
mech_eap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixes for Heimdal (macOS) builds from Stefan.
[mech_eap.git]
/
mech_eap
/
util_name.c
diff --git
a/mech_eap/util_name.c
b/mech_eap/util_name.c
index
455e764
..
b85565c
100644
(file)
--- a/
mech_eap/util_name.c
+++ b/
mech_eap/util_name.c
@@
-206,8
+206,13
@@
importServiceName(OM_uint32 *minor,
*minor = GSSEAP_BAD_SERVICE_NAME;
}
*minor = GSSEAP_BAD_SERVICE_NAME;
}
- if (realm != NULL)
+ if (realm != NULL) {
+#ifdef HAVE_HEIMDAL_VERSION
+ krb5_xfree(realm);
+#else
krb5_free_default_realm(krbContext, realm);
krb5_free_default_realm(krbContext, realm);
+#endif
+ }
GSSEAP_FREE(service);
return major;
GSSEAP_FREE(service);
return major;
@@
-270,10
+275,11
@@
importEapNameFlags(OM_uint32 *minor,
if (KRB_PRINC_REALM(krbPrinc) == NULL)
code = ENOMEM;
}
if (KRB_PRINC_REALM(krbPrinc) == NULL)
code = ENOMEM;
}
-#endif
-
+ krb5_xfree(defaultRealm);
+#else
if (defaultRealm != NULL)
krb5_free_default_realm(krbContext, defaultRealm);
if (defaultRealm != NULL)
krb5_free_default_realm(krbContext, defaultRealm);
+#endif
}
if (nameBuffer != GSS_C_NO_BUFFER)
}
if (nameBuffer != GSS_C_NO_BUFFER)
@@
-533,7
+539,7
@@
gssEapImportName(OM_uint32 *minor,
OM_uint32
gssEapExportName(OM_uint32 *minor,
OM_uint32
gssEapExportName(OM_uint32 *minor,
-
const gss
_name_t name,
+
gss_const
_name_t name,
gss_buffer_t exportedName)
{
return gssEapExportNameInternal(minor, name, exportedName,
gss_buffer_t exportedName)
{
return gssEapExportNameInternal(minor, name, exportedName,
@@
-542,7
+548,7
@@
gssEapExportName(OM_uint32 *minor,
OM_uint32
gssEapExportNameInternal(OM_uint32 *minor,
OM_uint32
gssEapExportNameInternal(OM_uint32 *minor,
-
const gss
_name_t name,
+
gss_const
_name_t name,
gss_buffer_t exportedName,
OM_uint32 flags)
{
gss_buffer_t exportedName,
OM_uint32 flags)
{
@@
-635,7
+641,7
@@
cleanup:
OM_uint32
gssEapCanonicalizeName(OM_uint32 *minor,
OM_uint32
gssEapCanonicalizeName(OM_uint32 *minor,
-
const gss
_name_t input_name,
+
gss_const
_name_t input_name,
const gss_OID mech_type,
gss_name_t *dest_name)
{
const gss_OID mech_type,
gss_name_t *dest_name)
{
@@
-697,7
+703,7
@@
cleanup:
OM_uint32
gssEapDuplicateName(OM_uint32 *minor,
OM_uint32
gssEapDuplicateName(OM_uint32 *minor,
-
const gss
_name_t input_name,
+
gss_const
_name_t input_name,
gss_name_t *dest_name)
{
return gssEapCanonicalizeName(minor, input_name,
gss_name_t *dest_name)
{
return gssEapCanonicalizeName(minor, input_name,
@@
-705,7
+711,7
@@
gssEapDuplicateName(OM_uint32 *minor,
}
static int
}
static int
-hasRealmP(gss_name_t name)
+hasRealmP(gss_
const_
name_t name)
{
#ifdef HAVE_HEIMDAL_VERSION
if (KRB_PRINC_REALM(name->krbPrincipal) != NULL &&
{
#ifdef HAVE_HEIMDAL_VERSION
if (KRB_PRINC_REALM(name->krbPrincipal) != NULL &&
@@
-720,7
+726,7
@@
hasRealmP(gss_name_t name)
OM_uint32
gssEapDisplayName(OM_uint32 *minor,
OM_uint32
gssEapDisplayName(OM_uint32 *minor,
- gss_name_t name,
+ gss_
const_
name_t name,
gss_buffer_t output_name_buffer,
gss_OID *output_name_type)
{
gss_buffer_t output_name_buffer,
gss_OID *output_name_type)
{
@@
-778,8
+784,8
@@
gssEapDisplayName(OM_uint32 *minor,
OM_uint32
gssEapCompareName(OM_uint32 *minor,
OM_uint32
gssEapCompareName(OM_uint32 *minor,
- gss_name_t name1,
- gss_name_t name2,
+ gss_
const_
name_t name1,
+ gss_
const_
name_t name2,
OM_uint32 flags,
int *name_equal)
{
OM_uint32 flags,
int *name_equal)
{