diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2000-04-12 08:11:37 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2000-04-12 08:11:37 +0000 |
| commit | 47943a8d442eedf7143cb0554d517561863e52d8 (patch) | |
| tree | 6df4ca64582e06033f2a1311a05eab0b1f4f8796 /usr.bin/ssh | |
| parent | 3c9dcf55889e63d1758128b6071e89101769d0ae (diff) | |
print 1.99 only if server supports both
Diffstat (limited to 'usr.bin/ssh')
| -rw-r--r-- | usr.bin/ssh/sshd.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c index 6c2258452d7..f0c504c5407 100644 --- a/usr.bin/ssh/sshd.c +++ b/usr.bin/ssh/sshd.c @@ -14,7 +14,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshd.c,v 1.102 2000/04/12 07:45:44 markus Exp $"); +RCSID("$OpenBSD: sshd.c,v 1.103 2000/04/12 08:11:36 markus Exp $"); #include "xmalloc.h" #include "rsa.h" @@ -275,7 +275,8 @@ sshd_exchange_identification(int sock_in, int sock_out) char buf[256]; /* Must not be larger than remote_version. */ char remote_version[256]; /* Must be at least as big as buf. */ - if (options.protocol & (SSH_PROTO_1|SSH_PROTO_2)) { + if ((options.protocol & SSH_PROTO_1) && + (options.protocol & SSH_PROTO_2)) { major = PROTOCOL_MAJOR_1; minor = 99; } else if (options.protocol & SSH_PROTO_2) { |