One way to massive patch. <sigh> It compiles and works under Linux..

And I think I have all the bits right from the OpenBSD tree.
20001222
 - Updated RCSID for pty.c
 - (bal) OpenBSD CVS Updates:
  - markus@cvs.openbsd.org 2000/12/21 15:10:16
    [auth-rh-rsa.c hostfile.c hostfile.h sshconnect.c]
    print keyfile:line for changed hostkeys, for deraadt@, ok deraadt@
  - markus@cvs.openbsd.org 2000/12/20 19:26:56
    [authfile.c]
    allow ssh -i userkey for root
  - markus@cvs.openbsd.org 2000/12/20 19:37:21
    [authfd.c authfd.h kex.c sshconnect2.c sshd.c uidswap.c uidswap.h]
    fix prototypes; from stevesk@pobox.com
  - markus@cvs.openbsd.org 2000/12/20 19:32:08
    [sshd.c]
    init pointer to NULL; report from Jan.Ivan@cern.ch
  - markus@cvs.openbsd.org 2000/12/19 23:17:54
    [auth-krb4.c auth-options.c auth-options.h auth-rhosts.c auth-rsa.c
     auth1.c auth2-skey.c auth2.c authfd.c authfd.h authfile.c bufaux.c
     bufaux.h buffer.c canohost.c channels.c clientloop.c compress.c
     crc32.c deattack.c getput.h hmac.c hmac.h hostfile.c kex.c kex.h
     key.c key.h log.c login.c match.c match.h mpaux.c mpaux.h packet.c
     packet.h radix.c readconf.c rsa.c scp.c servconf.c servconf.h
     serverloop.c session.c sftp-server.c ssh-agent.c ssh-dss.c ssh-dss.h
     ssh-keygen.c ssh-keyscan.c ssh-rsa.c ssh-rsa.h ssh.c ssh.h  uuencode.c
     uuencode.h sshconnect1.c sshconnect2.c sshd.c tildexpand.c]
    replace 'unsigned bla' with 'u_bla' everywhere. also replace 'char
    unsigned' with u_char.

1 files changed, 10 insertions, 10 deletions

diff --git a/radix.c b/radix.c
index 842920484..939d0f7fc 100644
--- a/radix.c
+++ b/radix.c
@@ -25,14 +25,14 @@
 #include "includes.h"
 #include "uuencode.h"
 
-RCSID("$OpenBSD: radix.c,v 1.13 2000/09/07 20:27:52 deraadt Exp $");
+RCSID("$OpenBSD: radix.c,v 1.14 2000/12/19 23:17:57 markus Exp $");
 
 #ifdef AFS
 #include <krb.h>
 
-typedef unsigned char my_u_char;
-typedef unsigned int my_u_int32_t;
-typedef unsigned short my_u_short;
+typedef u_char my_u_char;
+typedef u_int my_u_int32_t;
+typedef u_short my_u_short;
 
 /* Nasty macros from BIND-4.9.2 */
 
@@ -89,7 +89,7 @@ typedef unsigned short my_u_short;
 
 
 int
-creds_to_radix(CREDENTIALS *creds, unsigned char *buf, size_t buflen)
+creds_to_radix(CREDENTIALS *creds, u_char *buf, size_t buflen)
 {
 	char *p, *s;
 	int len;
@@ -123,8 +123,8 @@ creds_to_radix(CREDENTIALS *creds, unsigned char *buf, size_t buflen)
 
 	PUTLONG(creds->issue_date, p);
 	{
-		unsigned int endTime;
-		endTime = (unsigned int) krb_life_to_time(creds->issue_date,
+		u_int endTime;
+		endTime = (u_int) krb_life_to_time(creds->issue_date,
 							  creds->lifetime);
 		PUTLONG(endTime, p);
 	}
@@ -139,7 +139,7 @@ creds_to_radix(CREDENTIALS *creds, unsigned char *buf, size_t buflen)
 	p += creds->ticket_st.length;
 	len = p - temp;
 
-	return (uuencode((unsigned char *)temp, len, (char *)buf, buflen));
+	return (uuencode((u_char *)temp, len, (char *)buf, buflen));
 }
 
 int
@@ -151,7 +151,7 @@ radix_to_creds(const char *buf, CREDENTIALS *creds)
 	char version;
 	char temp[2048];
 
-	len = uudecode(buf, (unsigned char *)temp, sizeof(temp));
+	len = uudecode(buf, (u_char *)temp, sizeof(temp));
 	if (len < 0)
 		return 0;
 
@@ -184,7 +184,7 @@ radix_to_creds(const char *buf, CREDENTIALS *creds)
 	GETLONG(creds->issue_date, p);
 	len -= 4;
 	{
-		unsigned int endTime;
+		u_int endTime;
 		GETLONG(endTime, p);
 		len -= 4;
 		creds->lifetime = krb_time_to_life(creds->issue_date, endTime);