aboutsummaryrefslogtreecommitdiff
path: root/src/krb524/cnv_tkt_skey.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/krb524/cnv_tkt_skey.c')
-rw-r--r--src/krb524/cnv_tkt_skey.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/krb524/cnv_tkt_skey.c b/src/krb524/cnv_tkt_skey.c
index fc25246..79c467b 100644
--- a/src/krb524/cnv_tkt_skey.c
+++ b/src/krb524/cnv_tkt_skey.c
@@ -25,8 +25,14 @@
#include <sys/types.h>
#include <sys/time.h>
#include <netinet/in.h>
+#if TARGET_OS_MAC
+#include <Kerberos/krb.h>
+#include <Kerberos/krb524.h>
+#include "cr_tkt.h"
+#else
#include <krb.h>
#include "krb524.h"
+#endif
/* rather than copying the cmu code, these values are derived from
a calculation based on the table and comments found there.
@@ -72,7 +78,6 @@ int krb524_convert_tkt_skey(context, v5tkt, v4tkt, v5_skey, v4_skey,
v5tkt->enc_part2 = NULL;
if ((ret = krb5_decrypt_tkt_part(context, v5_skey, v5tkt))) {
- krb5_free_ticket(context, v5tkt);
return ret;
}
v5etkt = v5tkt->enc_part2;
@@ -91,7 +96,7 @@ int krb524_convert_tkt_skey(context, v5tkt, v4tkt, v5_skey, v4_skey,
fprintf(stderr, "v5 session keyblock type %d length %d != C_Block size %d\n",
v5etkt->session->enctype,
v5etkt->session->length,
- sizeof(C_Block));
+ (int) sizeof(C_Block));
krb5_free_enc_tkt_part(context, v5etkt);
v5tkt->enc_part2 = NULL;
return KRB524_BADKEY;