From 8fa781267960e7a7cbcca21acdb7c75fa93d81cb Mon Sep 17 00:00:00 2001 From: Ken Raeburn Date: Tue, 19 Aug 2008 23:07:11 +0000 Subject: [PATCH] Fix broken build -- conditionalize some stuff on DISABLE_PKINIT that I missed last time. ticket: 6076 git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@20675 dc483132-0cff-0310-8789-dd5450dbe970 --- src/lib/krb5/asn.1/krb5_decode.c | 2 ++ src/lib/krb5/asn.1/krb5_encode.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/lib/krb5/asn.1/krb5_decode.c b/src/lib/krb5/asn.1/krb5_decode.c index 8c6bef73f..d743a5317 100644 --- a/src/lib/krb5/asn.1/krb5_decode.c +++ b/src/lib/krb5/asn.1/krb5_decode.c @@ -948,6 +948,7 @@ krb5_error_code decode_krb5_predicted_sam_response(const krb5_data *code, krb5_p cleanup(free); } +#ifndef DISABLE_PKINIT krb5_error_code decode_krb5_pa_pk_as_req(const krb5_data *code, krb5_pa_pk_as_req **rep) { setup_buf_only(); @@ -1093,3 +1094,4 @@ krb5_error_code decode_krb5_td_dh_parameters(const krb5_data *code, krb5_algorit cleanup(free); } +#endif /* DISABLE_PKINIT */ diff --git a/src/lib/krb5/asn.1/krb5_encode.c b/src/lib/krb5/asn.1/krb5_encode.c index 682e9a289..68b95b9e5 100644 --- a/src/lib/krb5/asn.1/krb5_encode.c +++ b/src/lib/krb5/asn.1/krb5_encode.c @@ -1,7 +1,7 @@ /* * src/lib/krb5/asn.1/krb5_encode.c * - * Copyright 1994 by the Massachusetts Institute of Technology. + * Copyright 1994, 2008 by the Massachusetts Institute of Technology. * All Rights Reserved. * * Export of this software from the United States of America may @@ -905,6 +905,7 @@ krb5_error_code encode_krb5_setpw_req(const krb5_principal target, krb5_cleanup(); } +#ifndef DISABLE_PKINIT krb5_error_code encode_krb5_pa_pk_as_req(const krb5_pa_pk_as_req *rep, krb5_data **code) { krb5_setup(); @@ -1012,3 +1013,4 @@ krb5_error_code encode_krb5_td_dh_parameters(const krb5_algorithm_identifier **r sum += length; krb5_cleanup(); } +#endif /* DISABLE_PKINIT */ -- 2.26.2