diff options
| author | Ben Lindstrom <mouring@eviladmin.org> | 2001-09-20 23:13:49 +0000 |
|---|---|---|
| committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-09-20 23:13:49 +0000 |
| commit | f558cf658023ed272a75c9b942bdd0499805413b (patch) | |
| tree | 96d081d6bf029b89c01d839db513582378231ec5 | |
| parent | 1bc3bdb1c2d378687ab356b9f860262e8955e058 (diff) | |
- markus@cvs.openbsd.org 2001/09/20 13:50:40
[compat.c compat.h ssh.c]
bug compat: request a dummy channel for -N (no shell) sessions +
cleanup; vinschen@redhat.com
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | compat.c | 10 | ||||
| -rw-r--r-- | compat.h | 3 | ||||
| -rw-r--r-- | ssh.c | 25 |
4 files changed, 28 insertions, 16 deletions
@@ -8,6 +8,10 @@ - markus@cvs.openbsd.org 2001/09/20 13:46:48 [auth2.c] key_read returns now -1 or 1 + - markus@cvs.openbsd.org 2001/09/20 13:50:40 + [compat.c compat.h ssh.c] + bug compat: request a dummy channel for -N (no shell) sessions + + cleanup; vinschen@redhat.com 20010919 - (bal) OpenBSD Sync @@ -6541,4 +6545,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1552 2001/09/20 23:11:26 mouring Exp $ +$Id: ChangeLog,v 1.1553 2001/09/20 23:13:49 mouring Exp $ @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: compat.c,v 1.52 2001/09/17 21:09:47 markus Exp $"); +RCSID("$OpenBSD: compat.c,v 1.53 2001/09/20 13:50:40 markus Exp $"); #ifdef HAVE_LIBPCRE # include <pcreposix.h> @@ -93,18 +93,20 @@ compat_datafellows(const char *version) SSH_OLD_SESSIONID|SSH_BUG_DEBUG| SSH_BUG_PKSERVICE|SSH_BUG_X11FWD| SSH_BUG_PKOK|SSH_BUG_RSASIGMD5| - SSH_BUG_HBSERVICE|SSH_BUG_OPENFAILURE }, + SSH_BUG_HBSERVICE|SSH_BUG_OPENFAILURE| + SSH_BUG_DUMMYCHAN }, { "^2\\.0\\.1[1-2]", SSH_BUG_SIGBLOB|SSH_BUG_HMAC| SSH_OLD_SESSIONID|SSH_BUG_DEBUG| SSH_BUG_PKSERVICE|SSH_BUG_X11FWD| SSH_BUG_PKAUTH|SSH_BUG_PKOK| - SSH_BUG_RSASIGMD5|SSH_BUG_OPENFAILURE }, + SSH_BUG_RSASIGMD5|SSH_BUG_OPENFAILURE| + SSH_BUG_DUMMYCHAN }, { "^2\\.0\\.", SSH_BUG_SIGBLOB|SSH_BUG_HMAC| SSH_OLD_SESSIONID|SSH_BUG_DEBUG| SSH_BUG_PKSERVICE|SSH_BUG_X11FWD| SSH_BUG_PKAUTH|SSH_BUG_PKOK| SSH_BUG_RSASIGMD5|SSH_BUG_OPENFAILURE| - SSH_BUG_DERIVEKEY }, + SSH_BUG_DERIVEKEY|SSH_BUG_DUMMYCHAN }, { "^2\\.[23]\\.0", SSH_BUG_HMAC|SSH_BUG_DEBUG| SSH_BUG_RSASIGMD5 }, { "^2\\.3\\.", SSH_BUG_DEBUG|SSH_BUG_RSASIGMD5 }, @@ -21,7 +21,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* RCSID("$OpenBSD: compat.h,v 1.28 2001/06/26 17:27:23 markus Exp $"); */ +/* RCSID("$OpenBSD: compat.h,v 1.29 2001/09/20 13:50:40 markus Exp $"); */ #ifndef COMPAT_H #define COMPAT_H @@ -50,6 +50,7 @@ #define SSH_BUG_HBSERVICE 0x00010000 #define SSH_BUG_OPENFAILURE 0x00020000 #define SSH_BUG_DERIVEKEY 0x00040000 +#define SSH_BUG_DUMMYCHAN 0x00100000 void enable_compat13(void); void enable_compat20(void); @@ -39,7 +39,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh.c,v 1.142 2001/09/03 20:58:33 stevesk Exp $"); +RCSID("$OpenBSD: ssh.c,v 1.143 2001/09/20 13:50:40 markus Exp $"); #include <openssl/evp.h> #include <openssl/err.h> @@ -1032,14 +1032,15 @@ client_subsystem_reply(int type, int plen, void *ctxt) len, buffer_ptr(&command), id); } +/* request pty/x11/agent/tcpfwd/shell for channel */ static void -ssh_session2_callback(int id, void *arg) +ssh_session2_setup(int id, void *arg) { int len; int interactive = 0; struct termios tio; - debug("client_init id %d arg %ld", id, (long)arg); + debug("ssh_session2_setup: id %d", id); if (tty_flag) { struct winsize ws; @@ -1108,8 +1109,9 @@ ssh_session2_callback(int id, void *arg) packet_set_interactive(interactive); } +/* open new channel for a session */ static int -ssh_session2_command(void) +ssh_session2_open(void) { Channel *c; int window, packetmax, in, out, err; @@ -1144,13 +1146,15 @@ ssh_session2_command(void) window, packetmax, CHAN_EXTENDED_WRITE, xstrdup("client-session"), /*nonblock*/0); if (c == NULL) - fatal("ssh_session2_command: channel_new failed"); + fatal("ssh_session2_open: channel_new failed"); - debug3("ssh_session2_command: channel_new: %d", c->self); + debug3("ssh_session2_open: channel_new: %d", c->self); channel_send_open(c->self); - channel_register_callback(c->self, SSH2_MSG_CHANNEL_OPEN_CONFIRMATION, - ssh_session2_callback, (void *)0); + if (!no_shell_flag) + channel_register_callback(c->self, + SSH2_MSG_CHANNEL_OPEN_CONFIRMATION, + ssh_session2_setup, (void *)0); return c->self; } @@ -1158,12 +1162,13 @@ ssh_session2_command(void) static int ssh_session2(void) { - int id; + int id = -1; /* XXX should be pre-session */ ssh_init_forwarding(); - id = no_shell_flag ? -1 : ssh_session2_command(); + if (!no_shell_flag || (datafellows & SSH_BUG_DUMMYCHAN)) + id = ssh_session2_open(); /* If requested, let ssh continue in the background. */ if (fork_after_authentication_flag) |