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

diff --git a/src/kdc/ChangeLog b/src/kdc/ChangeLog
index 235e3a405670c00ec0dd6703335539af2b9f68e7..e6d4d4def1ff4af0a7ef5061da214db62e0a700c 100644 (file)
--- 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 7edb14d3a03f44cbe4841a8e08f7129181eb7def..e106f2ddccd6ecb5281b54cdcf9cef7ba32c974e 100644 (file)
--- 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 25e48064a49d1346987bf774db7fa83f12a08ff1..4aca41a35d99cc5a5adc31c61a0183007302384b 100644 (file)
--- 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 {