- markus@cvs.openbsd.org 2003/07/14 12:36:37
[sshd.c] remove undocumented -V option. would be only useful if openssh is used as ssh v1 server for ssh.com's ssh v2.
This commit is contained in:
parent
394b8c8db3
commit
fe0078ae49
|
@ -1,6 +1,11 @@
|
|||
20030719
|
||||
- (dtucker) [configure.ac] Bug #620: Define BROKEN_GETADDRINFO for
|
||||
Solaris/x86. Patch from jrhett at isite.net.
|
||||
- (dtucker) OpenBSD CVS Sync
|
||||
- markus@cvs.openbsd.org 2003/07/14 12:36:37
|
||||
[sshd.c]
|
||||
remove undocumented -V option. would be only useful if openssh is used
|
||||
as ssh v1 server for ssh.com's ssh v2.
|
||||
|
||||
20030714
|
||||
- (dtucker) [acconfig.h configure.ac port-aix.c] Older AIXes don't declare
|
||||
|
@ -697,4 +702,4 @@
|
|||
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
|
||||
Report from murple@murple.net, diagnosis from dtucker@zip.com.au
|
||||
|
||||
$Id: ChangeLog,v 1.2857 2003/07/19 09:49:45 dtucker Exp $
|
||||
$Id: ChangeLog,v 1.2858 2003/07/19 09:52:28 dtucker Exp $
|
||||
|
|
11
sshd.c
11
sshd.c
|
@ -42,7 +42,7 @@
|
|||
*/
|
||||
|
||||
#include "includes.h"
|
||||
RCSID("$OpenBSD: sshd.c,v 1.271 2003/06/28 16:23:06 deraadt Exp $");
|
||||
RCSID("$OpenBSD: sshd.c,v 1.272 2003/07/14 12:36:37 markus Exp $");
|
||||
|
||||
#include <openssl/dh.h>
|
||||
#include <openssl/bn.h>
|
||||
|
@ -370,7 +370,6 @@ sshd_exchange_identification(int sock_in, int sock_out)
|
|||
snprintf(buf, sizeof buf, "SSH-%d.%d-%.100s\n", major, minor, SSH_VERSION);
|
||||
server_version_string = xstrdup(buf);
|
||||
|
||||
if (client_version_string == NULL) {
|
||||
/* Send our protocol version identification. */
|
||||
if (atomicio(vwrite, sock_out, server_version_string,
|
||||
strlen(server_version_string))
|
||||
|
@ -402,7 +401,6 @@ sshd_exchange_identification(int sock_in, int sock_out)
|
|||
}
|
||||
buf[sizeof(buf) - 1] = 0;
|
||||
client_version_string = xstrdup(buf);
|
||||
}
|
||||
|
||||
/*
|
||||
* Check that the versions match. In future this might accept
|
||||
|
@ -841,7 +839,7 @@ main(int ac, char **av)
|
|||
initialize_server_options(&options);
|
||||
|
||||
/* Parse command-line arguments. */
|
||||
while ((opt = getopt(ac, av, "f:p:b:k:h:g:V:u:o:dDeiqtQ46")) != -1) {
|
||||
while ((opt = getopt(ac, av, "f:p:b:k:h:g:u:o:dDeiqtQ46")) != -1) {
|
||||
switch (opt) {
|
||||
case '4':
|
||||
IPv4or6 = AF_INET;
|
||||
|
@ -912,11 +910,6 @@ main(int ac, char **av)
|
|||
}
|
||||
options.host_key_files[options.num_host_key_files++] = optarg;
|
||||
break;
|
||||
case 'V':
|
||||
client_version_string = optarg;
|
||||
/* only makes sense with inetd_flag, i.e. no listen() */
|
||||
inetd_flag = 1;
|
||||
break;
|
||||
case 't':
|
||||
test_flag = 1;
|
||||
break;
|
||||
|
|
Loading…
Reference in New Issue