[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

8 files changed, 20 insertions, 15 deletions

diff --git a/ChangeLog b/ChangeLog
index 57dfff43d..4cfdbc7a0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,11 @@
    - markus@cvs.openbsd.org 2001/05/30 15:20:10
      [ssh.c]
      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
  - OpenBSD CVS Sync
@@ -5518,4 +5523,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - 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 $
diff --git a/auth-options.c b/auth-options.c
index d6258ab1a..210fbe7ea 100644
--- a/auth-options.c
+++ b/auth-options.c
@@ -10,14 +10,14 @@
  */
 
 #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 "xmalloc.h"
 #include "match.h"
 #include "log.h"
 #include "canohost.h"
-#include "channel.h"
+#include "channels.h"
 #include "auth-options.h"
 #include "servconf.h"
 
diff --git a/auth2.c b/auth2.c
index 05b601286..0b4df9cda 100644
--- a/auth2.c
+++ b/auth2.c
@@ -23,7 +23,7 @@
  */
 
 #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>
 
@@ -36,7 +36,7 @@ RCSID("$OpenBSD: auth2.c,v 1.60 2001/05/30 23:31:14 markus Exp $");
 #include "log.h"
 #include "servconf.h"
 #include "compat.h"
-#include "channel.h"
+#include "channels.h"
 #include "bufaux.h"
 #include "auth.h"
 #include "session.h"
diff --git a/clientloop.c b/clientloop.c
index 59a556a88..70abee8fd 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -59,7 +59,7 @@
  */
 
 #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 "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 "buffer.h"
 #include "compat.h"
-#include "channel.h"
+#include "channels.h"
 #include "dispatch.h"
 #include "buffer.h"
 #include "bufaux.h"
diff --git a/packet.c b/packet.c
index e3e68872a..402259a99 100644
--- a/packet.c
+++ b/packet.c
@@ -37,7 +37,7 @@
  */
 
 #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 "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 "deattack.h"
-#include "channel.h"
+#include "channels.h"
 
 #include "compat.h"
 #include "ssh1.h"
diff --git a/serverloop.c b/serverloop.c
index 5f50b4ee7..d8026ec5a 100644
--- a/serverloop.c
+++ b/serverloop.c
@@ -35,7 +35,7 @@
  */
 
 #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 "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 "servconf.h"
 #include "sshpty.h"
-#include "channel.h"
+#include "channels.h"
 #include "compat.h"
 #include "ssh1.h"
 #include "ssh2.h"
diff --git a/session.c b/session.c
index 8a8b4c114..0625bf81f 100644
--- a/session.c
+++ b/session.c
@@ -33,7 +33,7 @@
  */
 
 #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 "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 "uidswap.h"
 #include "compat.h"
-#include "channel.h"
+#include "channels.h"
 #include "bufaux.h"
 #include "auth.h"
 #include "auth-options.h"
diff --git a/ssh.c b/ssh.c
index dffd2d0d5..07947dc6a 100644
--- a/ssh.c
+++ b/ssh.c
@@ -39,7 +39,7 @@
  */
 
 #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/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 "buffer.h"
 #include "uidswap.h"
-#include "channel.h"
+#include "channels.h"
 #include "key.h"
 #include "authfd.h"
 #include "authfile.h"