diff -u -r krb5-current-dist/src/kdc/dispatch.c krb5-current/src/kdc/dispatch.c
--- krb5-current-dist/src/kdc/dispatch.c	2002-09-17 00:00:34.000000000 -0700
+++ krb5-current/src/kdc/dispatch.c	2003-04-20 14:03:26.000000000 -0700
@@ -55,8 +55,20 @@
 	const char *name = 0;
 	char buf[46];
 
+#ifdef HAVE_INET_NTOP
 	name = inet_ntop (ADDRTYPE2FAMILY (from->address->addrtype),
 			  from->address->contents, buf, sizeof (buf));
+#else
+	if (from->address->addrtype == ADDRTYPE_INET) {
+	    struct sockaddr_in *sin
+		= (struct sockaddr_in *)from->address->contents;
+	    if (name = inet_ntoa (sin->sin_addr))
+	    {
+	        strcpy (buf, name);
+	        name = buf;
+	    }
+	}
+#endif
 	if (name == 0)
 	    name = "[unknown address type]";
 	krb5_klog_syslog(LOG_INFO,
diff -u -r krb5-current-dist/src/kdc/do_as_req.c krb5-current/src/kdc/do_as_req.c
--- krb5-current-dist/src/kdc/do_as_req.c	2002-11-04 00:00:44.000000000 -0800
+++ krb5-current/src/kdc/do_as_req.c	2003-04-20 13:57:28.000000000 -0700
@@ -89,9 +89,14 @@
     ktypes2str(ktypestr, sizeof(ktypestr),
 	       request->nktypes, request->ktype);
 
+#ifdef HAVE_INET_NTOP
     fromstring = inet_ntop(ADDRTYPE2FAMILY (from->address->addrtype),
 			   from->address->contents,
 			   fromstringbuf, sizeof(fromstringbuf));
+#else
+    if (from->address->addrtype == ADDRTYPE_INET)
+	fromstring = (char *) inet_ntoa(*(struct in_addr *)from->address->contents);
+#endif
     if (!fromstring)
 	fromstring = "<unknown>";
 
diff -u -r krb5-current-dist/src/kdc/do_tgs_req.c krb5-current/src/kdc/do_tgs_req.c
--- krb5-current-dist/src/kdc/do_tgs_req.c	2003-04-02 00:00:46.000000000 -0800
+++ krb5-current/src/kdc/do_tgs_req.c	2003-04-20 13:57:28.000000000 -0700
@@ -103,9 +103,15 @@
     if ((retval = setup_server_realm(request->server)))
 	return retval;
 
+#ifdef HAVE_INET_NTOP
     fromstring = inet_ntop(ADDRTYPE2FAMILY(from->address->addrtype),
 			   from->address->contents,
 			   fromstringbuf, sizeof(fromstringbuf));
+#else
+    if (from->address->addrtype == ADDRTYPE_INET)
+	fromstring =
+	    (char *) inet_ntoa(*(struct in_addr *)from->address->contents);
+#endif
     if (!fromstring)
 	fromstring = "<unknown>";
 
diff -u -r krb5-current-dist/src/kdc/network.c krb5-current/src/kdc/network.c
--- krb5-current-dist/src/kdc/network.c	2003-01-04 00:00:42.000000000 -0800
+++ krb5-current/src/kdc/network.c	2003-04-20 13:57:28.000000000 -0700
@@ -742,10 +742,24 @@
     if (cc == -1) {
 	char addrbuf[46];
         krb5_free_data(kdc_context, response);
+#ifdef HAVE_INET_NTOP
 	if (inet_ntop(((struct sockaddr *)&saddr)->sa_family,
 		      addr.contents, addrbuf, sizeof(addrbuf)) == 0) {
 	    strcpy(addrbuf, "?");
 	}
+#else
+        {
+            char* addrstr;
+	    if (addrstr = inet_ntoa(((struct sockaddr_in *)&saddr)->sin_addr))
+	    {
+	        strncpy(addrbuf, addrstr, sizeof(addrbuf));
+	    }
+	    else
+	    {
+	        strcpy(addrbuf, "?");
+	    }
+	}
+#endif
 	com_err(prog, errno, "while sending reply to %s/%d",
 		addrbuf, faddr.port);
 	return;
diff -u -r krb5-current-dist/src/lib/krb5/rcache/rc_io.c krb5-current/src/lib/krb5/rcache/rc_io.c
--- krb5-current-dist/src/lib/krb5/rcache/rc_io.c	2002-09-17 00:01:00.000000000 -0700
+++ krb5-current/src/lib/krb5/rcache/rc_io.c	2003-04-20 13:58:10.000000000 -0700
@@ -271,7 +271,7 @@
 krb5_rc_io_move(krb5_context context, krb5_rc_iostuff *new1,
 		krb5_rc_iostuff *old)
 {
-#if defined(_WIN32)
+#if defined(_WIN32) || defined(__CYGWIN__)
     char *new_fn = NULL;
     char *old_fn = NULL;
     off_t offset = 0;