projects
/
mech_eap.orig
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Heimdal portability fixes (except for reauth)
[mech_eap.orig]
/
accept_sec_context.c
diff --git
a/accept_sec_context.c
b/accept_sec_context.c
index
7fa39ef
..
d7a4708
100644
(file)
--- a/
accept_sec_context.c
+++ b/
accept_sec_context.c
@@
-197,10
+197,10
@@
setAcceptorIdentity(OM_uint32 *minor,
krbPrinc = ctx->acceptorName->krbPrincipal;
assert(krbPrinc != NULL);
krbPrinc = ctx->acceptorName->krbPrincipal;
assert(krbPrinc != NULL);
- assert(
krb5_princ_size(krbContext,
krbPrinc) >= 2);
+ assert(
KRB_PRINC_LENGTH(
krbPrinc) >= 2);
/* Acceptor-Service-Name */
/* Acceptor-Service-Name */
- krb
DataToGssBuffer(krb5_princ_component(krbContext, krbPrinc, 0)
, &nameBuf);
+ krb
PrincComponentToGssBuffer(krbPrinc, 0
, &nameBuf);
major = gssEapRadiusAddAvp(minor, vps,
PW_GSS_ACCEPTOR_SERVICE_NAME,
major = gssEapRadiusAddAvp(minor, vps,
PW_GSS_ACCEPTOR_SERVICE_NAME,
@@
-210,7
+210,7
@@
setAcceptorIdentity(OM_uint32 *minor,
return major;
/* Acceptor-Host-Name */
return major;
/* Acceptor-Host-Name */
- krb
DataToGssBuffer(krb5_princ_component(krbContext, krbPrinc, 1)
, &nameBuf);
+ krb
PrincComponentToGssBuffer(krbPrinc, 1
, &nameBuf);
major = gssEapRadiusAddAvp(minor, vps,
PW_GSS_ACCEPTOR_HOST_NAME,
major = gssEapRadiusAddAvp(minor, vps,
PW_GSS_ACCEPTOR_HOST_NAME,
@@
-219,13
+219,13
@@
setAcceptorIdentity(OM_uint32 *minor,
if (GSS_ERROR(major))
return major;
if (GSS_ERROR(major))
return major;
- if (
krb5_princ_size(krbContext,
krbPrinc) > 2) {
+ if (
KRB_PRINC_LENGTH(
krbPrinc) > 2) {
/* Acceptor-Service-Specific */
krb5_principal_data ssiPrinc = *krbPrinc;
char *ssi;
/* Acceptor-Service-Specific */
krb5_principal_data ssiPrinc = *krbPrinc;
char *ssi;
-
krb5_princ_size(krbContext,
&ssiPrinc) -= 2;
-
krb5_princ_name(krbContext,
&ssiPrinc) += 2;
+
KRB_PRINC_LENGTH(
&ssiPrinc) -= 2;
+
KRB_PRINC_NAME(
&ssiPrinc) += 2;
*minor = krb5_unparse_name_flags(krbContext, &ssiPrinc,
KRB5_PRINCIPAL_UNPARSE_NO_REALM, &ssi);
*minor = krb5_unparse_name_flags(krbContext, &ssiPrinc,
KRB5_PRINCIPAL_UNPARSE_NO_REALM, &ssi);
@@
-247,7
+247,7
@@
setAcceptorIdentity(OM_uint32 *minor,
krb5_free_unparsed_name(krbContext, ssi);
}
krb5_free_unparsed_name(krbContext, ssi);
}
- krb
DataToGssBuffer(krb5_princ_realm(krbContext, krbPrinc)
, &nameBuf);
+ krb
PrincRealmToGssBuffer(krbPrinc
, &nameBuf);
if (nameBuf.length != 0) {
/* Acceptor-Realm-Name */
major = gssEapRadiusAddAvp(minor, vps,
if (nameBuf.length != 0) {
/* Acceptor-Realm-Name */
major = gssEapRadiusAddAvp(minor, vps,