[NOTE: Next patch will sync nchan.c, channels.c and channels.h and all this

pain will be over.]
   - markus@cvs.openbsd.org 2001/05/31 10:30:17
     [auth-options.c auth2.c channels.c channels.h clientloop.c nchan.c
      packet.c serverloop.c session.c ssh.c]
     undo the .c file split, just merge the header and keep the cvs
     history
This commit is contained in:
Ben Lindstrom 2001-06-09 00:36:26 +00:00
parent cd4349f969
commit c763767f18
8 changed files with 20 additions and 15 deletions

View File

@ -7,6 +7,11 @@
- markus@cvs.openbsd.org 2001/05/30 15:20:10 - markus@cvs.openbsd.org 2001/05/30 15:20:10
[ssh.c] [ssh.c]
merge functions, simplify. merge functions, simplify.
- markus@cvs.openbsd.org 2001/05/31 10:30:17
[auth-options.c auth2.c channels.c channels.h clientloop.c nchan.c
packet.c serverloop.c session.c ssh.c]
undo the .c file split, just merge the header and keep the cvs
history
20010606 20010606
- OpenBSD CVS Sync - OpenBSD CVS Sync
@ -5518,4 +5523,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1248 2001/06/09 00:18:51 mouring Exp $ $Id: ChangeLog,v 1.1249 2001/06/09 00:36:26 mouring Exp $

View File

@ -10,14 +10,14 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: auth-options.c,v 1.17 2001/05/30 12:55:06 markus Exp $"); RCSID("$OpenBSD: auth-options.c,v 1.18 2001/05/31 10:30:12 markus Exp $");
#include "packet.h" #include "packet.h"
#include "xmalloc.h" #include "xmalloc.h"
#include "match.h" #include "match.h"
#include "log.h" #include "log.h"
#include "canohost.h" #include "canohost.h"
#include "channel.h" #include "channels.h"
#include "auth-options.h" #include "auth-options.h"
#include "servconf.h" #include "servconf.h"

View File

@ -23,7 +23,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: auth2.c,v 1.60 2001/05/30 23:31:14 markus Exp $"); RCSID("$OpenBSD: auth2.c,v 1.61 2001/05/31 10:30:12 markus Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
@ -36,7 +36,7 @@ RCSID("$OpenBSD: auth2.c,v 1.60 2001/05/30 23:31:14 markus Exp $");
#include "log.h" #include "log.h"
#include "servconf.h" #include "servconf.h"
#include "compat.h" #include "compat.h"
#include "channel.h" #include "channels.h"
#include "bufaux.h" #include "bufaux.h"
#include "auth.h" #include "auth.h"
#include "session.h" #include "session.h"

View File

@ -59,7 +59,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: clientloop.c,v 1.73 2001/05/30 12:55:10 markus Exp $"); RCSID("$OpenBSD: clientloop.c,v 1.74 2001/05/31 10:30:15 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "ssh1.h" #include "ssh1.h"
@ -68,7 +68,7 @@ RCSID("$OpenBSD: clientloop.c,v 1.73 2001/05/30 12:55:10 markus Exp $");
#include "packet.h" #include "packet.h"
#include "buffer.h" #include "buffer.h"
#include "compat.h" #include "compat.h"
#include "channel.h" #include "channels.h"
#include "dispatch.h" #include "dispatch.h"
#include "buffer.h" #include "buffer.h"
#include "bufaux.h" #include "bufaux.h"

View File

@ -37,7 +37,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: packet.c,v 1.63 2001/05/30 12:55:11 markus Exp $"); RCSID("$OpenBSD: packet.c,v 1.64 2001/05/31 10:30:16 markus Exp $");
#include "xmalloc.h" #include "xmalloc.h"
#include "buffer.h" #include "buffer.h"
@ -48,7 +48,7 @@ RCSID("$OpenBSD: packet.c,v 1.63 2001/05/30 12:55:11 markus Exp $");
#include "compress.h" #include "compress.h"
#include "deattack.h" #include "deattack.h"
#include "channel.h" #include "channels.h"
#include "compat.h" #include "compat.h"
#include "ssh1.h" #include "ssh1.h"

View File

@ -35,7 +35,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: serverloop.c,v 1.66 2001/05/30 12:55:12 markus Exp $"); RCSID("$OpenBSD: serverloop.c,v 1.67 2001/05/31 10:30:16 markus Exp $");
#include "xmalloc.h" #include "xmalloc.h"
#include "packet.h" #include "packet.h"
@ -43,7 +43,7 @@ RCSID("$OpenBSD: serverloop.c,v 1.66 2001/05/30 12:55:12 markus Exp $");
#include "log.h" #include "log.h"
#include "servconf.h" #include "servconf.h"
#include "sshpty.h" #include "sshpty.h"
#include "channel.h" #include "channels.h"
#include "compat.h" #include "compat.h"
#include "ssh1.h" #include "ssh1.h"
#include "ssh2.h" #include "ssh2.h"

View File

@ -33,7 +33,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: session.c,v 1.77 2001/05/30 12:55:13 markus Exp $"); RCSID("$OpenBSD: session.c,v 1.78 2001/05/31 10:30:16 markus Exp $");
#include "ssh.h" #include "ssh.h"
#include "ssh1.h" #include "ssh1.h"
@ -45,7 +45,7 @@ RCSID("$OpenBSD: session.c,v 1.77 2001/05/30 12:55:13 markus Exp $");
#include "mpaux.h" #include "mpaux.h"
#include "uidswap.h" #include "uidswap.h"
#include "compat.h" #include "compat.h"
#include "channel.h" #include "channels.h"
#include "bufaux.h" #include "bufaux.h"
#include "auth.h" #include "auth.h"
#include "auth-options.h" #include "auth-options.h"

4
ssh.c
View File

@ -39,7 +39,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: ssh.c,v 1.122 2001/05/30 15:20:10 markus Exp $"); RCSID("$OpenBSD: ssh.c,v 1.123 2001/05/31 10:30:17 markus Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/err.h> #include <openssl/err.h>
@ -53,7 +53,7 @@ RCSID("$OpenBSD: ssh.c,v 1.122 2001/05/30 15:20:10 markus Exp $");
#include "packet.h" #include "packet.h"
#include "buffer.h" #include "buffer.h"
#include "uidswap.h" #include "uidswap.h"
#include "channel.h" #include "channels.h"
#include "key.h" #include "key.h"
#include "authfd.h" #include "authfd.h"
#include "authfile.h" #include "authfile.h"