- 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
*/
#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"
*/
#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 "log.h"
#include "servconf.h"
#include "compat.h"
-#include "channel.h"
+#include "channels.h"
#include "bufaux.h"
#include "auth.h"
#include "session.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 "ssh1.h"
#include "packet.h"
#include "buffer.h"
#include "compat.h"
-#include "channel.h"
+#include "channels.h"
#include "dispatch.h"
#include "buffer.h"
#include "bufaux.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 "buffer.h"
#include "compress.h"
#include "deattack.h"
-#include "channel.h"
+#include "channels.h"
#include "compat.h"
#include "ssh1.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 "packet.h"
#include "log.h"
#include "servconf.h"
#include "sshpty.h"
-#include "channel.h"
+#include "channels.h"
#include "compat.h"
#include "ssh1.h"
#include "ssh2.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 "ssh1.h"
#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"
*/
#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>
#include "packet.h"
#include "buffer.h"
#include "uidswap.h"
-#include "channel.h"
+#include "channels.h"
#include "key.h"
#include "authfd.h"
#include "authfile.h"