From f95d2b3f6e086428def795c9eeeee9aeb4d261ee Mon Sep 17 00:00:00 2001 From: Paul Park Date: Thu, 27 Jul 1995 19:41:44 +0000 Subject: [PATCH] Fix compiler complaints and remove dependence on mit-des.h git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6337 dc483132-0cff-0310-8789-dd5450dbe970 --- src/kdc/ChangeLog | 12 ++++++++++++ src/kdc/kdc_util.c | 3 ++- src/kdc/kerberos_v4.c | 6 +++--- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog index 235e3a405..e6d4d4def 100644 --- a/src/kdc/ChangeLog +++ b/src/kdc/ChangeLog @@ -1,4 +1,16 @@ +Thu Jul 27 15:10:58 EDT 1995 Paul Park (pjpark@mit.edu) + * configure.in - Add --with-vague-errors and --with-kdc-kdb-update + which define KRBCONF_VAGUE_ERRORS and KRBCONF_KDC_MODIFIES_KDB + which replace the definitions that used to be in k5-config.h. + * kdc_util.c - Cast argument to fetch_asn1_field which caused a + compiler moan. + * kerberos_v4.c - Use KRB5_PROTOTYPE for v4_klog which is set correctly + for the compiler. Some compilers (e.g. OSF/1 native) understand + prototypes even when not in STDC mode. + Also use KRB5_MIT_DES_KEYSIZE instead of MIT_DES_KEYSIZE. + + Thu Jul 27 02:59:05 1995 Chris Provenzano (proven@mit.edu) * do_as_req.c do_tgs_req.c kdc_util.c main.c : Use new kdb format. diff --git a/src/kdc/kdc_util.c b/src/kdc/kdc_util.c index 7edb14d3a..e106f2ddc 100644 --- a/src/kdc/kdc_util.c +++ b/src/kdc/kdc_util.c @@ -294,7 +294,8 @@ kdc_process_tgs_req(request, from, pkt, ticket, subkey) * checksum that directly; if that fails, then we try encoding * using our local asn.1 library. */ - if (pkt && (fetch_asn1_field(pkt->data, 1, 4, &scratch1) >= 0)) { + if (pkt && (fetch_asn1_field((unsigned char *) pkt->data, + 1, 4, &scratch1) >= 0)) { if (comp_cksum(kdc_context, &scratch1, *ticket, his_cksum)) { if (!(retval = encode_krb5_kdc_req_body(request, &scratch))) retval = comp_cksum(kdc_context, scratch, *ticket, his_cksum); diff --git a/src/kdc/kerberos_v4.c b/src/kdc/kerberos_v4.c index 25e48064a..4aca41a35 100644 --- a/src/kdc/kerberos_v4.c +++ b/src/kdc/kerberos_v4.c @@ -78,9 +78,9 @@ int kerb_get_principal PROTOTYPE((char *, char *, Principal *, unsigned int, int check_princ PROTOTYPE((char *, char *, unsigned, Principal *)); #ifdef HAVE_STDARG_H -char * v4_klog PROTOTYPE((int, const char *, ...)); +char * v4_klog KRB5_PROTOTYPE((int, const char *, ...)); #else -char * v4_klog PROTOTYPE((int, char *, va_dcl)); +char * v4_klog KRB5_PROTOTYPE((int, char *, va_dcl)); #endif /* take this out when we don't need it anymore */ @@ -314,7 +314,7 @@ compat_decrypt_key (in5, out4) lt = klog(L_DEATH_REQ, "KDC can't decrypt principal's key."); } if ( ! out5.contents) return( retval); - if ( out5.length != MIT_DES_KEYSIZE) { + if ( out5.length != KRB5_MIT_DES_KEYSIZE) { lt = klog( L_DEATH_REQ,"internal keysize error in kdc"); } else { -- 2.26.2