- Merged very large OpenBSD source code reformat

 - OpenBSD CVS updates
   - [channels.c cipher.c compat.c log-client.c scp.c serverloop.c]
     [ssh.h sshd.8 sshd.c]
     syslog changes:
     * Unified Logmessage for all auth-types, for success and for failed
     * Standard connections get only ONE line in the LOG when level==LOG:
       Auth-attempts are logged only, if authentication is:
          a) successfull or
          b) with passwd or
          c) we had more than AUTH_FAIL_LOG failues
     * many log() became verbose()
     * old behaviour with level=VERBOSE
   - [readconf.c readconf.h ssh.1 ssh.h sshconnect.c sshd.c]
     tranfer s/key challenge/response data in SSH_SMSG_AUTH_TIS_CHALLENGE
     messages. allows use of s/key in windows (ttssh, securecrt) and
     ssh-1.2.27 clients without 'ssh -v', ok: niels@
   - [sshd.8]
     -V, for fallback to openssh in SSH2 compatibility mode
   - [sshd.c]
     fix sigchld race; cjc5@po.cwru.edu

1 files changed, 34 insertions, 28 deletions

diff --git a/channels.h b/channels.h
index 608c774d..5851257c 100644
--- a/channels.h
+++ b/channels.h
@@ -1,40 +1,46 @@
-/* RCSID("$Id: channels.h,v 1.2 1999/10/30 01:39:56 damien Exp $"); */
+/* RCSID("$Id: channels.h,v 1.3 1999/11/24 13:26:22 damien Exp $"); */
 
 #ifndef CHANNELS_H
 #define CHANNELS_H
 
 /* Definitions for channel types. */
-#define SSH_CHANNEL_FREE		0 /* This channel is free (unused). */
-#define SSH_CHANNEL_X11_LISTENER	1 /* Listening for inet X11 conn. */
-#define SSH_CHANNEL_PORT_LISTENER	2 /* Listening on a port. */
-#define SSH_CHANNEL_OPENING		3 /* waiting for confirmation */
-#define SSH_CHANNEL_OPEN		4 /* normal open two-way channel */
-#define SSH_CHANNEL_CLOSED		5 /* waiting for close confirmation */
+#define SSH_CHANNEL_FREE		0	/* This channel is free
+						 * (unused). */
+#define SSH_CHANNEL_X11_LISTENER	1	/* Listening for inet X11
+						 * conn. */
+#define SSH_CHANNEL_PORT_LISTENER	2	/* Listening on a port. */
+#define SSH_CHANNEL_OPENING		3	/* waiting for confirmation */
+#define SSH_CHANNEL_OPEN		4	/* normal open two-way channel */
+#define SSH_CHANNEL_CLOSED		5	/* waiting for close
+						 * confirmation */
 /*	SSH_CHANNEL_AUTH_FD		6    authentication fd */
-#define SSH_CHANNEL_AUTH_SOCKET		7 /* authentication socket */
+#define SSH_CHANNEL_AUTH_SOCKET		7	/* authentication socket */
 /*	SSH_CHANNEL_AUTH_SOCKET_FD	8    connection to auth socket */
-#define SSH_CHANNEL_X11_OPEN		9 /* reading first X11 packet */
-#define SSH_CHANNEL_INPUT_DRAINING	10 /* sending remaining data to conn */
-#define SSH_CHANNEL_OUTPUT_DRAINING	11 /* sending remaining data to app */
+#define SSH_CHANNEL_X11_OPEN		9	/* reading first X11 packet */
+#define SSH_CHANNEL_INPUT_DRAINING	10	/* sending remaining data to
+						 * conn */
+#define SSH_CHANNEL_OUTPUT_DRAINING	11	/* sending remaining data to
+						 * app */
 
 /* Data structure for channel data.  This is iniailized in channel_allocate
    and cleared in channel_free. */
 
-typedef struct Channel
-{
-  int type;		/* channel type/state */
-  int self;		/* my own channel identifier */
-  int remote_id;	/* channel identifier for remote peer */
-			/* peer can be reached over encrypted connection, via packet-sent */
-  int istate;		/* input from channel (state of receive half) */
-  int ostate;		/* output to channel  (state of transmit half) */
-  int sock;		/* data socket, linked to this channel */
-  Buffer input;		/* data read from socket, to be sent over encrypted connection */
-  Buffer output;	/* data received over encrypted connection for send on socket */
-  char path[200];	/* path for unix domain sockets, or host name for forwards */
-  int listening_port;	/* port being listened for forwards */
-  int host_port;	/* remote port to connect for forwards */
-  char *remote_name;	/* remote hostname */
-} Channel;
-
+typedef struct Channel {
+	int     type;		/* channel type/state */
+	int     self;		/* my own channel identifier */
+	int     remote_id;	/* channel identifier for remote peer */
+	/* peer can be reached over encrypted connection, via packet-sent */
+	int     istate;		/* input from channel (state of receive half) */
+	int     ostate;		/* output to channel  (state of transmit half) */
+	int     sock;		/* data socket, linked to this channel */
+	Buffer  input;		/* data read from socket, to be sent over
+				 * encrypted connection */
+	Buffer  output;		/* data received over encrypted connection for
+				 * send on socket */
+	char    path[200];	/* path for unix domain sockets, or host name
+				 * for forwards */
+	int     listening_port;	/* port being listened for forwards */
+	int     host_port;	/* remote port to connect for forwards */
+	char   *remote_name;	/* remote hostname */
+}       Channel;
 #endif