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

diff --git a/servconf.h b/servconf.h
index 3ecf6a00d..7d5016662 100644
--- a/servconf.h
+++ b/servconf.h
@@ -11,7 +11,7 @@
  * called by a name other than "ssh" or "Secure Shell".
  */
 
-/* RCSID("$OpenBSD: servconf.h,v 1.31 2000/11/12 19:50:38 markus Exp $"); */
+/* RCSID("$OpenBSD: servconf.h,v 1.32 2000/12/19 23:17:58 markus Exp $"); */
 
 #ifndef SERVCONF_H
 #define SERVCONF_H
@@ -26,8 +26,8 @@
 #define MAX_HOSTKEYS            256     /* Max # hostkeys. */
 
 typedef struct {
-        unsigned int num_ports;
-        unsigned int ports_from_cmdline;
+        u_int num_ports;
+        u_int ports_from_cmdline;
         u_short ports[MAX_PORTS];       /* Port number to listen on. */
         char   *listen_addr;            /* Address on which the server listens. */
         struct addrinfo *listen_addrs;  /* Addresses on which the server listens. */
@@ -88,16 +88,16 @@ typedef struct {
                                          * passwords. */
         int     use_login;      /* If true, login(1) is used */
         int     allow_tcp_forwarding;
-        unsigned int num_allow_users;
+        u_int num_allow_users;
         char   *allow_users[MAX_ALLOW_USERS];
-        unsigned int num_deny_users;
+        u_int num_deny_users;
         char   *deny_users[MAX_DENY_USERS];
-        unsigned int num_allow_groups;
+        u_int num_allow_groups;
         char   *allow_groups[MAX_ALLOW_GROUPS];
-        unsigned int num_deny_groups;
+        u_int num_deny_groups;
         char   *deny_groups[MAX_DENY_GROUPS];
 
-        unsigned int num_subsystems;
+        u_int num_subsystems;
         char   *subsystem_name[MAX_SUBSYSTEMS];
         char   *subsystem_command[MAX_SUBSYSTEMS];