- 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

4 files changed, 28 insertions, 16 deletions

diff --git a/ChangeLog b/ChangeLog
index 1c93c101a..1e3d3f7c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 $
diff --git a/compat.c b/compat.c
index 61a79914c..1d3e97056 100644
--- a/compat.c
+++ b/compat.c
@@ -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 },
diff --git a/compat.h b/compat.h
index 7d688cc9e..b6609efb0 100644
--- a/compat.h
+++ b/compat.h
@@ -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);
diff --git a/ssh.c b/ssh.c
index 9ccd9d8f1..f0cbd799c 100644
--- a/ssh.c
+++ b/ssh.c
@@ -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)