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

diff --git a/session.c b/session.c
index 1e996f95a..a376aa963 100644
--- a/session.c
+++ b/session.c
@@ -33,7 +33,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: session.c,v 1.44 2000/11/14 23:44:19 markus Exp $");
+RCSID("$OpenBSD: session.c,v 1.45 2000/12/19 23:17:58 markus Exp $");
 
 #include "xmalloc.h"
 #include "ssh.h"
@@ -137,7 +137,7 @@ extern ServerOptions options;
 extern char *__progname;
 extern int log_stderr;
 extern int debug_flag;
-extern unsigned int utmp_len;
+extern u_int utmp_len;
 
 extern int startup_pipe;
 
@@ -218,7 +218,7 @@ do_authenticated(struct passwd * pw)
         char *command;
         int n_bytes;
         int plen;
-        unsigned int proto_len, data_len, dlen;
+        u_int proto_len, data_len, dlen;
 
         /*
          * Cancel the alarm we set to limit the time taken for
@@ -783,10 +783,10 @@ do_login(Session *s, const char *command)
  * already exists, its value is overriden.
  */
 void
-child_set_env(char ***envp, unsigned int *envsizep, const char *name,
+child_set_env(char ***envp, u_int *envsizep, const char *name,
               const char *value)
 {
-        unsigned int i, namelen;
+        u_int i, namelen;
         char **env;
 
         /*
@@ -824,7 +824,7 @@ child_set_env(char ***envp, unsigned int *envsizep, const char *name,
  * and assignments of the form name=value.  No other forms are allowed.
  */
 void
-read_environment_file(char ***env, unsigned int *envsize,
+read_environment_file(char ***env, u_int *envsize,
                       const char *filename)
 {
         FILE *f;
@@ -1009,7 +1009,7 @@ do_child(const char *command, struct passwd * pw, const char *term,
         char buf[256];
         char cmd[1024];
         FILE *f = NULL;
-        unsigned int envsize, i;
+        u_int envsize, i;
         char **env;
         extern char **environ;
         struct stat st;
@@ -1579,7 +1579,7 @@ session_window_change_req(Session *s)
 int
 session_pty_req(Session *s)
 {
-        unsigned int len;
+        u_int len;
         char *term_modes;       /* encoded terminal modes */
 
         if (no_pty_flag)
@@ -1628,7 +1628,7 @@ session_pty_req(Session *s)
 int
 session_subsystem_req(Session *s)
 {
-        unsigned int len;
+        u_int len;
         int success = 0;
         char *subsys = packet_get_string(&len);
         int i;
@@ -1724,7 +1724,7 @@ session_shell_req(Session *s)
 int
 session_exec_req(Session *s)
 {
-        unsigned int len;
+        u_int len;
         char *command = packet_get_string(&len);
         packet_done();
         if (forced_command) {
@@ -1762,7 +1762,7 @@ session_auth_agent_req(Session *s)
 void
 session_input_channel_req(int id, void *arg)
 {
-        unsigned int len;
+        u_int len;
         int reply;
         int success = 0;
         char *rtype;