diff --git a/crypto/dist/krb4/lib/kadm/kadm_cli_wrap.c b/crypto/dist/krb4/lib/kadm/kadm_cli_wrap.c
index f85d9249a3ba..caea33c7d527 100644
--- a/crypto/dist/krb4/lib/kadm/kadm_cli_wrap.c
+++ b/crypto/dist/krb4/lib/kadm/kadm_cli_wrap.c
@@ -29,7 +29,7 @@ or implied warranty.
 
 #include "kadm_locl.h"
 
-RCSID("$Id: kadm_cli_wrap.c,v 1.1.1.2 2000/12/29 01:43:09 assar Exp $");
+RCSID("$Id: kadm_cli_wrap.c,v 1.2 2000/12/29 02:52:35 assar Exp $");
 
 static Kadm_Client client_parm;
 
@@ -47,7 +47,7 @@ clear_secrets(void)
 	memset(sess_sched, 0, sizeof(sess_sched));
 }
 
-static RETSIGTYPE (*opipe)();
+static RETSIGTYPE (*opipe)(int);
 
 static void
 kadm_cli_disconn(void)
@@ -276,8 +276,8 @@ kadm_cli_send(u_char *st_dat,	/* the actual data */
 #ifdef NOENCRYPTION
 	cksum = 0;
 #else
-	cksum = des_quad_cksum((des_cblock *)priv_pak,
-			       (des_cblock *)0, priv_len, 0,
+	cksum = des_quad_cksum(priv_pak,
+			       0, priv_len, 0,
 			       &sess_key);
 #endif
 	
diff --git a/crypto/dist/krb4/lib/kdb/krb_kdb_utils.c b/crypto/dist/krb4/lib/kdb/krb_kdb_utils.c
index dd01c3316550..3a0254e97c8d 100644
--- a/crypto/dist/krb4/lib/kdb/krb_kdb_utils.c
+++ b/crypto/dist/krb4/lib/kdb/krb_kdb_utils.c
@@ -31,7 +31,7 @@ or implied warranty.
 
 #include <kdc.h>
 
-RCSID("$Id: krb_kdb_utils.c,v 1.1.1.2 2000/12/29 01:43:11 assar Exp $");
+RCSID("$Id: krb_kdb_utils.c,v 1.2 2000/12/29 02:52:36 assar Exp $");
 
 /* always try /.k for backwards compatibility */
 static char *master_key_files[] = { MKEYFILE, "/.k", NULL };
@@ -142,7 +142,7 @@ kdb_new_get_new_master_key(des_cblock *key,
   des_key_sched(key, schedule);
   
   des_read_pw_string(buf, sizeof(buf), "Enter master key seed: ", 0);
-  des_cbc_cksum((des_cblock*)buf, key, sizeof(buf), schedule, key);
+  des_cbc_cksum(buf, key, sizeof(buf), schedule, key);
   memset(buf, 0, sizeof(buf));
 #endif
   des_key_sched(key, schedule);
@@ -196,7 +196,7 @@ kdb_encrypt_key (des_cblock (*in), des_cblock (*out),
 #ifdef NOENCRYPTION
   memcpy(out, in, sizeof(des_cblock));
 #else
-  des_pcbc_encrypt(in,out,(long)sizeof(des_cblock),master_key_sched,master_key,
+  des_pcbc_encrypt((const void *)in,(void *)out,(long)sizeof(des_cblock),master_key_sched,master_key,
 		   e_d_flag);
 #endif
 }
diff --git a/crypto/dist/krb4/lib/krb/decomp_ticket.c b/crypto/dist/krb4/lib/krb/decomp_ticket.c
index 7aecdfde9d53..41a0412727b8 100644
--- a/crypto/dist/krb4/lib/krb/decomp_ticket.c
+++ b/crypto/dist/krb4/lib/krb/decomp_ticket.c
@@ -33,7 +33,7 @@
 
 #include "krb_locl.h"
 
-RCSID("$Id: decomp_ticket.c,v 1.1.1.2 2000/12/29 01:43:12 assar Exp $");
+RCSID("$Id: decomp_ticket.c,v 1.2 2000/12/29 02:52:36 assar Exp $");
 
 /*
  * This routine takes a ticket and pointers to the variables that
@@ -70,7 +70,7 @@ decomp_ticket(KTEXT tkt,	/* The ticket to be decoded */
     
     int little_endian;
 
-    des_pcbc_encrypt((des_cblock *)tkt->dat, (des_cblock *)tkt->dat,
+    des_pcbc_encrypt(tkt->dat, tkt->dat,
 		     tkt->length, schedule, key, DES_DECRYPT);
 
     tkt->mbz = 0;
diff --git a/crypto/dist/krb4/lib/krb/encrypt_ktext.c b/crypto/dist/krb4/lib/krb/encrypt_ktext.c
index ed214740498e..22f2422b04bb 100644
--- a/crypto/dist/krb4/lib/krb/encrypt_ktext.c
+++ b/crypto/dist/krb4/lib/krb/encrypt_ktext.c
@@ -33,14 +33,14 @@
 
 #include "krb_locl.h"
 
-RCSID("$Id: encrypt_ktext.c,v 1.1.1.2 2000/12/29 01:43:12 assar Exp $");
+RCSID("$Id: encrypt_ktext.c,v 1.2 2000/12/29 02:52:36 assar Exp $");
 
 void
 encrypt_ktext(KTEXT cip, des_cblock *key, int encrypt)
 {
     des_key_schedule schedule;
     des_set_key(key, schedule);
-    des_pcbc_encrypt((des_cblock*)cip->dat, (des_cblock*)cip->dat, 
+    des_pcbc_encrypt(cip->dat, cip->dat, 
 		     cip->length, schedule, key, encrypt);
     memset(schedule, 0, sizeof(des_key_schedule));
 }
diff --git a/crypto/dist/krb4/lib/krb/krb-protos.h b/crypto/dist/krb4/lib/krb/krb-protos.h
index 38ccbb241c05..e2ffbe5337e3 100644
--- a/crypto/dist/krb4/lib/krb/krb-protos.h
+++ b/crypto/dist/krb4/lib/krb/krb-protos.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE. 
  */
 
-/* $Id: krb-protos.h,v 1.1.1.2 2000/12/29 01:43:14 assar Exp $ */
+/* $Id: krb-protos.h,v 1.2 2000/12/29 02:52:36 assar Exp $ */
 
 #ifndef __krb_protos_h__
 #define __krb_protos_h__
@@ -786,4 +786,7 @@ int KRB_LIB_FUNCTION
 krb_add_our_ip_for_realm __P((const char *user, const char *instance,
 			      const char *realm, const char *password));
 
+int KRB_LIB_FUNCTION
+krb_get_our_ip_for_realm __P((const char *realm, struct in_addr *ip_addr));
+
 #endif /* __krb_protos_h__ */
diff --git a/crypto/dist/krb4/lib/krb/mk_priv.c b/crypto/dist/krb4/lib/krb/mk_priv.c
index 98e920815a06..cc8db255b272 100644
--- a/crypto/dist/krb4/lib/krb/mk_priv.c
+++ b/crypto/dist/krb4/lib/krb/mk_priv.c
@@ -33,7 +33,7 @@
 
 #include "krb_locl.h"
 
-RCSID("$Id: mk_priv.c,v 1.1.1.2 2000/12/29 01:43:17 assar Exp $");
+RCSID("$Id: mk_priv.c,v 1.2 2000/12/29 02:52:36 assar Exp $");
 
 /* application include files */
 #include "krb-archaeology.h"
@@ -113,7 +113,7 @@ krb_mk_priv(void *in, void *out, u_int32_t length,
     
     memset(p, 0, 7);
 
-    des_pcbc_encrypt((des_cblock *)cipher, (des_cblock *)cipher,
+    des_pcbc_encrypt(cipher, cipher,
 		     len, schedule, key, DES_ENCRYPT);
 
     return  (cipher - (unsigned char*)out) + len;
diff --git a/crypto/dist/krb4/lib/krb/rd_priv.c b/crypto/dist/krb4/lib/krb/rd_priv.c
index 556ee604f4ed..17f56f0a024f 100644
--- a/crypto/dist/krb4/lib/krb/rd_priv.c
+++ b/crypto/dist/krb4/lib/krb/rd_priv.c
@@ -33,7 +33,7 @@
 
 #include "krb_locl.h"
 
-RCSID("$Id: rd_priv.c,v 1.1.1.2 2000/12/29 01:43:18 assar Exp $");
+RCSID("$Id: rd_priv.c,v 1.2 2000/12/29 02:52:36 assar Exp $");
 
 /* application include files */
 #include "krb-archaeology.h"
@@ -83,7 +83,7 @@ krb_rd_priv(void *in, u_int32_t in_length,
     if(clen + 2 > in_length)
 	return RD_AP_MODIFIED;
 
-    des_pcbc_encrypt((des_cblock*)p, (des_cblock*)p, clen, 
+    des_pcbc_encrypt(p, p, clen, 
 		     schedule, key, DES_DECRYPT);
     
     p += krb_get_int(p, &m_data->app_length, 4, little_endian);
diff --git a/crypto/dist/krb4/lib/krb/rd_safe.c b/crypto/dist/krb4/lib/krb/rd_safe.c
index 59358de9b18d..6cb1d7d8257b 100644
--- a/crypto/dist/krb4/lib/krb/rd_safe.c
+++ b/crypto/dist/krb4/lib/krb/rd_safe.c
@@ -33,7 +33,7 @@
 
 #include "krb_locl.h"
 
-RCSID("$Id: rd_safe.c,v 1.1.1.2 2000/12/29 01:43:18 assar Exp $");
+RCSID("$Id: rd_safe.c,v 1.2 2000/12/29 02:52:36 assar Exp $");
 
 /* application include files */
 #include "krb-archaeology.h"
@@ -60,7 +60,7 @@ void
 fixup_quad_cksum(void *start, size_t len, des_cblock *key, 
 		 void *new_checksum, void *old_checksum, int little)
 {
-    des_quad_cksum((des_cblock*)start, (des_cblock*)new_checksum, len, 2, key);
+    des_quad_cksum(start, new_checksum, len, 2, key);
     if(HOST_BYTE_ORDER){
 	if(little){
 	    memcpy(old_checksum, new_checksum, 16);
diff --git a/crypto/dist/krb4/lib/krb/send_to_kdc.c b/crypto/dist/krb4/lib/krb/send_to_kdc.c
index 752478050b95..a8659de70035 100644
--- a/crypto/dist/krb4/lib/krb/send_to_kdc.c
+++ b/crypto/dist/krb4/lib/krb/send_to_kdc.c
@@ -22,7 +22,7 @@ or implied warranty.
 #include "krb_locl.h"
 #include <base64.h>
 
-RCSID("$Id: send_to_kdc.c,v 1.1.1.2 2000/12/29 01:43:19 assar Exp $");
+RCSID("$Id: send_to_kdc.c,v 1.2 2000/12/29 02:52:36 assar Exp $");
 
 struct host {
     struct sockaddr_in addr;
@@ -143,7 +143,6 @@ send_to_kdc(KTEXT pkt, KTEXT rpkt, const char *realm)
 	char **addr_list;
 	int j;
 	int n_addrs;
-	struct host *tmp;
 
 	if (k_host->proto == PROTO_HTTP && proxy != NULL) {
 	    n_addrs = 1;
diff --git a/crypto/dist/krb4/lib/krb/str2key.c b/crypto/dist/krb4/lib/krb/str2key.c
index 8e38a0d2efeb..314d5c65579e 100644
--- a/crypto/dist/krb4/lib/krb/str2key.c
+++ b/crypto/dist/krb4/lib/krb/str2key.c
@@ -33,7 +33,7 @@
 
 #include "krb_locl.h"
 
-RCSID("$Id: str2key.c,v 1.1.1.2 2000/12/29 01:43:19 assar Exp $");
+RCSID("$Id: str2key.c,v 1.2 2000/12/29 02:52:36 assar Exp $");
 
 #define lowcase(c) (('A' <= (c) && (c) <= 'Z') ? ((c) - 'A' + 'a') : (c))
 
@@ -92,13 +92,13 @@ afs_string_to_key(const char *pass, const char *cell, des_cblock *key)
       memcpy(key, "kdsbdsns", 8);
       des_key_sched(key, sched);
       /* Beware, ivec is passed twice */
-      des_cbc_cksum((des_cblock *)buf, &ivec, plen + clen, sched, &ivec);
+      des_cbc_cksum(buf, &ivec, plen + clen, sched, &ivec);
 
       memcpy(key, &ivec, 8);
       des_fixup_key_parity(key);
       des_key_sched(key, sched);
       /* Beware, ivec is passed twice */
-      des_cbc_cksum((des_cblock *)buf, key, plen + clen, sched, &ivec);
+      des_cbc_cksum(buf, key, plen + clen, sched, &ivec);
       free(buf);
       des_fixup_key_parity(key);
     }