- OpenBSD CVS update

  - markus@cvs.openbsd.org
    [clientloop.c sshconnect2.c]
    - make x11-fwd interop w/ ssh-2.0.13
    [README.openssh2]
    - interop w/ SecureFX
 - Release 2.0.0beta2

diff --git a/ChangeLog b/ChangeLog
index 6c84661072fc12ec632e9dcc015ce616cf3eb8a0..a525273d28ed6abd07fadc7bbae7671043425645 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 20000508
  - Makefile and RPM spec fixes
  - Generate DSA host keys during "make key" or RPM installs
+ - OpenBSD CVS update
+  - markus@cvs.openbsd.org
+    [clientloop.c sshconnect2.c]
+    - make x11-fwd interop w/ ssh-2.0.13
+    [README.openssh2]
+    - interop w/ SecureFX
+ - Release 2.0.0beta2
 
 20000507
  - Remove references to SSLeay.

diff --git a/README.openssh2 b/README.openssh2
index 91c0f1eca4ee76045b799416fa56da551062447a..9c034aebd9a8f4e12bf2310d2f188e22e46f5330 100644 (file)
--- a/README.openssh2
+++ b/README.openssh2
@@ -25,7 +25,7 @@ works:
                x11-fwd
        dss/dsa: host key database in ~/.ssh/known_hosts2
        client interops w/ sshd2, lshd
-       server interops w/ ssh2, lsh, ssh.com's Windows client, SecureCRT, F-Secure SSH Client 4.0
+       server interops w/ ssh2, lsh, ssh.com's Windows client, SecureCRT, F-Secure SSH Client 4.0, SecureFX (secure ftp)
        server supports multiple concurrent sessions (e.g. with SSH.com Windows client)
 todo:
        re-keying

diff --git a/clientloop.c b/clientloop.c
index 86972f67583f13013fe49c594dd3549ed77b3451..f91cb80b2085baaf4b2e6ef6cfa3f2d63cb8e9c5 100644 (file)
--- a/clientloop.c
+++ b/clientloop.c
@@ -979,7 +979,12 @@ client_input_channel_open(int type, int plen)
                char *originator;
                int originator_port;
                originator = packet_get_string(NULL);
-               originator_port = packet_get_int();
+               if (packet_remaining() > 0) {
+                       originator_port = packet_get_int();
+               } else {
+                       debug("buggy server: x11 request w/o originator_port");
+                       originator_port = 0;
+               }
                packet_done();
                /* XXX check permission */
                xfree(originator);

diff --git a/sshconnect2.c b/sshconnect2.c
index 17325b097ff5d5b1638ec0f1ec0581f0d16e2cab..3bddd7cc8c37e4211739862f24e11fafb567f4da 100644 (file)
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -28,7 +28,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect2.c,v 1.7 2000/05/06 17:45:37 markus Exp $");
+RCSID("$OpenBSD: sshconnect2.c,v 1.8 2000/05/07 18:23:32 markus Exp $");
 
 #include <openssl/bn.h>
 #include <openssl/rsa.h>
@@ -405,7 +405,7 @@ ssh_userauth2(const char *server_user, char *host)
                xfree(reply);
        } else {
                /* payload empty for ssh-2.0.13 ?? */
-               log("buggy server: service_accept w/o service");
+               debug("buggy server: service_accept w/o service");
        }
        packet_done();
        debug("got SSH2_MSG_SERVICE_ACCEPT");