diff options
| author | Damien Miller <djm@mindrot.org> | 2000-04-12 12:17:38 +0200 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2000-04-12 12:17:38 +0200 |
| commit | 78928793fb23a3a4c80ae62eca6a7826b2987690 (patch) | |
| tree | add8a953ac4cf06877b91624fe7f647b17e6cf6f /ssh.c | |
| parent | - More large OpenBSD CVS updates: (diff) | |
| download | openssh-78928793fb23a3a4c80ae62eca6a7826b2987690.tar.xz openssh-78928793fb23a3a4c80ae62eca6a7826b2987690.zip | |
- OpenBSD CVS updates:
- [channels.c]
repair x11-fwd
- [sshconnect.c]
fix passwd prompt for ssh2, less debugging output.
- [clientloop.c compat.c dsa.c kex.c sshd.c]
less debugging output
- [kex.c kex.h sshconnect.c sshd.c]
check for reasonable public DH values
- [README.openssh2 cipher.c cipher.h compat.c compat.h readconf.c]
[readconf.h servconf.c servconf.h ssh.c ssh.h sshconnect.c sshd.c]
add Cipher and Protocol options to ssh/sshd, e.g.:
ssh -o 'Protocol 1,2' if you prefer proto 1, ssh -o 'Ciphers
arcfour,3des-cbc'
- [sshd.c]
print 1.99 only if server supports both
Diffstat (limited to 'ssh.c')
| -rw-r--r-- | ssh.c | 9 |
1 files changed, 6 insertions, 3 deletions
@@ -11,7 +11,7 @@ */ #include "includes.h" -RCSID("$Id: ssh.c,v 1.24 2000/04/06 02:32:40 damien Exp $"); +RCSID("$Id: ssh.c,v 1.25 2000/04/12 10:17:40 damien Exp $"); #include "xmalloc.h" #include "ssh.h" @@ -42,6 +42,7 @@ int IPv4or6 = AF_UNSPEC; /* Flag indicating whether debug mode is on. This can be set on the command line. */ int debug_flag = 0; +/* Flag indicating whether a tty should be allocated */ int tty_flag = 0; /* don't exec a shell */ @@ -336,8 +337,10 @@ main(int ac, char **av) case 'v': case 'V': - fprintf(stderr, "SSH Version %s, protocol version %d.%d.\n", - SSH_VERSION, PROTOCOL_MAJOR, PROTOCOL_MINOR); + fprintf(stderr, "SSH Version %s, protocol versions %d.%d/%d.%d.\n", + SSH_VERSION, + PROTOCOL_MAJOR_1, PROTOCOL_MINOR_1, + PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2); fprintf(stderr, "Compiled with SSL (0x%8.8lx).\n", SSLeay()); if (opt == 'V') exit(0); |