summaryrefslogtreecommitdiff
path: root/usr.bin
diff options
context:
space:
mode:
authorMarkus Friedl <markus@cvs.openbsd.org>2001-04-05 21:05:25 +0000
committerMarkus Friedl <markus@cvs.openbsd.org>2001-04-05 21:05:25 +0000
commit2a2cf0f5835adde5c500a952be1347062c2aa30c (patch)
treeb2faa40b6ec95faf73f7e11eb6d409073823612d /usr.bin
parentad69bc76a2d01dab4e59b35690415fe3ac4b74b7 (diff)
don't request a session for 'ssh -N', pointed out slade@shore.net
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/ssh/clientloop.c23
-rw-r--r--usr.bin/ssh/ssh.c38
2 files changed, 40 insertions, 21 deletions
diff --git a/usr.bin/ssh/clientloop.c b/usr.bin/ssh/clientloop.c
index 74610c6b188..ad20b2f0e77 100644
--- a/usr.bin/ssh/clientloop.c
+++ b/usr.bin/ssh/clientloop.c
@@ -59,7 +59,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: clientloop.c,v 1.59 2001/04/05 20:01:10 markus Exp $");
+RCSID("$OpenBSD: clientloop.c,v 1.60 2001/04/05 21:05:23 markus Exp $");
#include "ssh.h"
#include "ssh1.h"
@@ -128,6 +128,7 @@ static u_int buffer_high;/* Soft max buffer size. */
static int connection_in; /* Connection to server (input). */
static int connection_out; /* Connection to server (output). */
static int need_rekeying; /* Set to non-zero if rekeying is requested. */
+static int session_closed = 0; /* In SSH2: login session closed. */
void client_init_dispatch(void);
int session_ident = -1;
@@ -788,6 +789,15 @@ simple_escape_filter(Channel *c, char *buf, int len)
return process_escapes(&c->input, &c->output, &c->extended, buf, len);
}
+void
+client_channel_closed(int id, void *arg)
+{
+ if (id != session_ident)
+ error("client_channel_closed: id %d != session_ident %d",
+ id, session_ident);
+ session_closed = 1;
+}
+
/*
* Implements the interactive session with the server. This is called after
* the user has been authenticated, and a command has been started on the
@@ -851,6 +861,9 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
if (escape_char != -1)
channel_register_filter(session_ident,
simple_escape_filter);
+ if (session_ident != -1)
+ channel_register_cleanup(session_ident,
+ client_channel_closed);
} else {
/* Check if we should immediately send eof on stdin. */
client_check_initial_eof_on_stdin();
@@ -862,12 +875,10 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
/* Process buffered packets sent by the server. */
client_process_buffered_input_packets();
- rekeying = (xxx_kex != NULL && !xxx_kex->done);
-
- if (compat20 && !channel_still_open()) {
- debug2("!channel_still_open.");
+ if (compat20 && session_closed && !channel_still_open())
break;
- }
+
+ rekeying = (xxx_kex != NULL && !xxx_kex->done);
if (rekeying) {
debug("rekeying in progress");
diff --git a/usr.bin/ssh/ssh.c b/usr.bin/ssh/ssh.c
index b68227ea78a..05b3a234465 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.105 2001/03/26 08:07:09 markus Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.106 2001/04/05 21:05:24 markus Exp $");
#include <openssl/evp.h>
#include <openssl/err.h>
@@ -926,9 +926,6 @@ ssh_session2_callback(int id, void *arg)
debug("client_init id %d arg %ld", id, (long)arg);
- if (no_shell_flag)
- goto done;
-
if (tty_flag) {
struct winsize ws;
char *cp;
@@ -991,15 +988,14 @@ ssh_session2_callback(int id, void *arg)
}
/* channel_callback(id, SSH2_MSG_OPEN_CONFIGMATION, client_init, 0); */
-done:
/* register different callback, etc. XXX */
packet_set_interactive(interactive);
}
int
-ssh_session2(void)
+ssh_session2_command(void)
{
- int window, packetmax, id;
+ int id, window, packetmax;
int in, out, err;
if (stdin_null_flag) {
@@ -1021,14 +1017,6 @@ ssh_session2(void)
if (!isatty(err))
set_nonblock(err);
- /* XXX should be pre-session */
- ssh_init_forwarding();
-
- /* If requested, let ssh continue in the background. */
- if (fork_after_authentication_flag)
- if (daemon(1, 1) < 0)
- fatal("daemon() failed: %.200s", strerror(errno));
-
window = CHAN_SES_WINDOW_DEFAULT;
packetmax = CHAN_SES_PACKET_DEFAULT;
if (!tty_flag) {
@@ -1040,10 +1028,30 @@ ssh_session2(void)
window, packetmax, CHAN_EXTENDED_WRITE,
xstrdup("client-session"), /*nonblock*/0);
+debug("channel_new: %d", id);
+
channel_open(id);
channel_register_callback(id, SSH2_MSG_CHANNEL_OPEN_CONFIRMATION,
ssh_session2_callback, (void *)0);
+ return id;
+}
+
+int
+ssh_session2(void)
+{
+ int id;
+
+ /* XXX should be pre-session */
+ ssh_init_forwarding();
+
+ id = no_shell_flag ? -1 : ssh_session2_command();
+
+ /* If requested, let ssh continue in the background. */
+ if (fork_after_authentication_flag)
+ if (daemon(1, 1) < 0)
+ fatal("daemon() failed: %.200s", strerror(errno));
+
return client_loop(tty_flag, tty_flag ? options.escape_char : -1, id);
}