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, 6 insertions, 6 deletions

diff --git a/auth1.c b/auth1.c
index fec73e3a2..5c906b60b 100644
--- a/auth1.c
+++ b/auth1.c
@@ -10,7 +10,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth1.c,v 1.7 2000/11/10 01:04:40 markus Exp $");
+RCSID("$OpenBSD: auth1.c,v 1.8 2000/12/19 23:17:55 markus Exp $");
 
 #ifdef HAVE_OSF_SIA
 # include <sia.h>
@@ -81,14 +81,14 @@ do_authloop(struct passwd * pw, char *luser)
 {
         int authenticated = 0;
         int attempt = 0;
-        unsigned int bits;
+        u_int bits;
         RSA *client_host_key;
         BIGNUM *n;
         char *client_user, *password;
         char user[1024];
-        unsigned int dlen;
+        u_int dlen;
         int plen, nlen, elen;
-        unsigned int ulen;
+        u_int ulen;
         int type = 0;
         void (*authlog) (const char *fmt,...) = verbose;
 
@@ -149,7 +149,7 @@ do_authloop(struct passwd * pw, char *luser)
                                 /* Try Kerberos v4 authentication. */
                                 KTEXT_ST auth;
                                 char *tkt_user = NULL;
-                                char *kdata = packet_get_string((unsigned int *) &auth.length);
+                                char *kdata = packet_get_string((u_int *) &auth.length);
                                 packet_integrity_check(plen, 4 + auth.length, type);
 
                                 if (auth.length < MAX_KTXT_LEN)
@@ -394,7 +394,7 @@ do_authentication()
 {
         struct passwd *pw, pwcopy;
         int plen;
-        unsigned int ulen;
+        u_int ulen;
         char *user;
 
         /* Get the name of the user that we wish to log in as. */