summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-06-09 00:18:51 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-06-09 00:18:51 +0000
commit5ec2645a2d4a5045e587868b3f2ed33ae187f594 (patch)
treee996715d3738d2926c957986322fb47733c7a794
parente6455aee8fe31931f006f390fcbf0e99c1fbaacf (diff)
- markus@cvs.openbsd.org 2001/05/30 15:20:10
[ssh.c] merge functions, simplify.
-rw-r--r--ChangeLog5
-rw-r--r--ssh.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 1fedb7d1..57dfff43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
[auth-options.c auth2.c channels.c channels.h clientloop.c nchan.c
packet.c serverloop.c session.c ssh.c ssh1.h]
channel layer cleanup: merge header files and split .c files
+ - markus@cvs.openbsd.org 2001/05/30 15:20:10
+ [ssh.c]
+ merge functions, simplify.
20010606
- OpenBSD CVS Sync
@@ -5515,4 +5518,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1247 2001/06/09 00:17:10 mouring Exp $
+$Id: ChangeLog,v 1.1248 2001/06/09 00:18:51 mouring Exp $
diff --git a/ssh.c b/ssh.c
index 84c85d2b..dffd2d0d 100644
--- a/ssh.c
+++ b/ssh.c
@@ -39,7 +39,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.121 2001/05/30 12:55:13 markus Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.122 2001/05/30 15:20:10 markus Exp $");
#include <openssl/evp.h>
#include <openssl/err.h>
@@ -1095,7 +1095,7 @@ ssh_session2_command(void)
debug3("ssh_session2_command: channel_new: %d", c->self);
- channel_open(c->self);
+ channel_send_open(c->self);
channel_register_callback(c->self, SSH2_MSG_CHANNEL_OPEN_CONFIRMATION,
ssh_session2_callback, (void *)0);