summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/ssh.c
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2002-02-05 14:32:56 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2002-02-05 14:32:56 +0000
commitfd362f75091b583aa0226be47339b24782dab8e0 (patch)
tree509144770a26077693783e980106502bd4c74b2e /usr.bin/ssh/ssh.c
parentc870c6f1e4bd2f2b7bc9eb4af6804c6b8a714ead (diff)
merge channel_request() into channel_request_start()
Diffstat (limited to 'usr.bin/ssh/ssh.c')
-rw-r--r--usr.bin/ssh/ssh.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c
index 5aec17c6d12..1e9d2c8070b 100644
--- a/usr.bin/ssh/ssh.c
+++ b/usr.bin/ssh/ssh.c
@@ -39,7 +39,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.160 2002/02/03 17:58:21 markus Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.161 2002/02/05 14:32:55 markus Exp $");
#include <openssl/evp.h>
#include <openssl/err.h>
@@ -1090,7 +1090,8 @@ ssh_session2_setup(int id, void *arg)
packet_put_string(buffer_ptr(&command), buffer_len(&command));
packet_send();
} else {
- channel_request(id, "shell", 0);
+ channel_request_start(id, "shell", 0);
+ packet_send();
}
/* channel_callback(id, SSH2_MSG_OPEN_CONFIGMATION, client_init, 0); */