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.
diff --git a/channels.c b/channels.c
index 8c0a7a4..3c2f15f 100644
--- a/channels.c
+++ b/channels.c
@@ -40,7 +40,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: channels.c,v 1.76 2000/12/19 22:43:44 markus Exp $");
+RCSID("$OpenBSD: channels.c,v 1.77 2000/12/19 23:17:56 markus Exp $");
#include "ssh.h"
#include "packet.h"
@@ -95,14 +95,14 @@
/* Saved X11 authentication data. This is the real data. */
char *x11_saved_data = NULL;
-unsigned int x11_saved_data_len = 0;
+u_int x11_saved_data_len = 0;
/*
* Fake X11 authentication data. This is what the server will be sending us;
* we should replace any occurrences of this by the real data.
*/
char *x11_fake_data = NULL;
-unsigned int x11_fake_data_len;
+u_int x11_fake_data_len;
/*
* Data structure for storing which hosts are permitted for forward requests.
@@ -436,15 +436,15 @@
int
x11_open_helper(Channel *c)
{
- unsigned char *ucp;
- unsigned int proto_len, data_len;
+ u_char *ucp;
+ u_int proto_len, data_len;
/* Check if the fixed size part of the packet is in buffer. */
if (buffer_len(&c->output) < 12)
return 0;
/* Parse the lengths of variable-length fields. */
- ucp = (unsigned char *) buffer_ptr(&c->output);
+ ucp = (u_char *) buffer_ptr(&c->output);
if (ucp[0] == 0x42) { /* Byte order MSB first. */
proto_len = 256 * ucp[6] + ucp[7];
data_len = 256 * ucp[8] + ucp[9];
@@ -1066,7 +1066,7 @@
{
int id;
char *data;
- unsigned int data_len;
+ u_int data_len;
Channel *c;
/* Get the channel number and verify it. */
@@ -1112,7 +1112,7 @@
int id;
int tcode;
char *data;
- unsigned int data_len;
+ u_int data_len;
Channel *c;
/* Get the channel number and verify it. */
@@ -1155,7 +1155,7 @@
int
channel_not_very_much_buffered_data()
{
- unsigned int i;
+ u_int i;
Channel *c;
for (i = 0; i < channels_alloc; i++) {
@@ -1423,7 +1423,7 @@
int
channel_still_open()
{
- unsigned int i;
+ u_int i;
for (i = 0; i < channels_alloc; i++)
switch (channels[i].type) {
case SSH_CHANNEL_FREE:
@@ -1786,7 +1786,7 @@
u_short host_port;
char *host, *originator_string;
int remote_channel, sock = -1, newch, i, denied;
- unsigned int host_len, originator_len;
+ u_int host_len, originator_len;
/* Get remote channel number. */
remote_channel = packet_get_int();
@@ -1996,7 +1996,7 @@
static
int
-connect_local_xsocket(unsigned int dnr)
+connect_local_xsocket(u_int dnr)
{
static const char *const x_sockets[] = {
X_UNIX_PATH "%u",
@@ -2129,7 +2129,7 @@
{
int remote_channel, sock = 0, newch;
char *remote_host;
- unsigned int remote_len;
+ u_int remote_len;
/* Get remote channel number. */
remote_channel = packet_get_int();
@@ -2200,8 +2200,8 @@
x11_request_forwarding_with_spoofing(int client_session_id,
const char *proto, const char *data)
{
- unsigned int data_len = (unsigned int) strlen(data) / 2;
- unsigned int i, value;
+ u_int data_len = (u_int) strlen(data) / 2;
+ u_int i, value;
char *new_data;
int screen_number;
const char *cp;
@@ -2241,7 +2241,7 @@
/* Convert the fake data into hex. */
new_data = xmalloc(2 * data_len + 1);
for (i = 0; i < data_len; i++)
- sprintf(new_data + 2 * i, "%02x", (unsigned char) x11_fake_data[i]);
+ sprintf(new_data + 2 * i, "%02x", (u_char) x11_fake_data[i]);
/* Send the request packet. */
if (compat20) {