summaryrefslogtreecommitdiff
path: root/ssh.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-02-08 22:04:26 +1100
committerDamien Miller <djm@mindrot.org>2002-02-08 22:04:26 +1100
commita500cd608eb505c41fca079433721d46a02e8e1a (patch)
tree8d8b0155a68f04aae97d8438d20465bc584cef51 /ssh.c
parent8829d3669d154dbd06f9ee2cc779f14e2af8e15f (diff)
- markus@cvs.openbsd.org 2002/02/05 14:32:55
[channels.c channels.h ssh.c] merge channel_request() into channel_request_start()
Diffstat (limited to 'ssh.c')
-rw-r--r--ssh.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/ssh.c b/ssh.c
index 5ec27219e..6415d27f9 100644
--- a/ssh.c
+++ b/ssh.c
@@ -39,7 +39,7 @@
39 */ 39 */
40 40
41#include "includes.h" 41#include "includes.h"
42RCSID("$OpenBSD: ssh.c,v 1.160 2002/02/03 17:58:21 markus Exp $"); 42RCSID("$OpenBSD: ssh.c,v 1.161 2002/02/05 14:32:55 markus Exp $");
43 43
44#include <openssl/evp.h> 44#include <openssl/evp.h>
45#include <openssl/err.h> 45#include <openssl/err.h>
@@ -1110,7 +1110,8 @@ ssh_session2_setup(int id, void *arg)
1110 packet_put_string(buffer_ptr(&command), buffer_len(&command)); 1110 packet_put_string(buffer_ptr(&command), buffer_len(&command));
1111 packet_send(); 1111 packet_send();
1112 } else { 1112 } else {
1113 channel_request(id, "shell", 0); 1113 channel_request_start(id, "shell", 0);
1114 packet_send();
1114 } 1115 }
1115 /* channel_callback(id, SSH2_MSG_OPEN_CONFIGMATION, client_init, 0); */ 1116 /* channel_callback(id, SSH2_MSG_OPEN_CONFIGMATION, client_init, 0); */
1116 1117