diff options
author | Damien Miller <djm@mindrot.org> | 2000-03-09 21:27:49 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-03-09 21:27:49 +1100 |
commit | 98c7ad60ec5725d91da9f9f6d26cd9fe477398c0 (patch) | |
tree | 104c3e3474be8e308d05e22d79715c833c6cf837 /ssh.c | |
parent | 1a07ebd4d8d39c6814bbd84c1aec4ebf2bd005a2 (diff) |
- OpenBSD CVS updates to v1.2.3
[ssh.h atomicio.c]
- int atomicio -> ssize_t (for alpha). ok deraadt@
[auth-rsa.c]
- delay MD5 computation until client sends response, free() early, cleanup.
[cipher.c]
- void* -> unsigned char*, ok niels@
[hostfile.c]
- remove unused variable 'len'. fix comments.
- remove unused variable
[log-client.c log-server.c]
- rename a cpp symbol, to avoid param.h collision
[packet.c]
- missing xfree()
- getsockname() requires initialized tolen; andy@guildsoftware.com
- use getpeername() in packet_connection_is_on_socket(), fixes sshd -i;
from Holger.Trapp@Informatik.TU-Chemnitz.DE
[pty.c pty.h]
- register cleanup for pty earlier. move code for pty-owner handling to
pty.c ok provos@, dugsong@
[readconf.c]
- turn off x11-fwd for the client, too.
[rsa.c]
- PKCS#1 padding
[scp.c]
- allow '.' in usernames; from jedgar@fxp.org
[servconf.c]
- typo: ignore_user_known_hosts int->flag; naddy@mips.rhein-neckar.de
- sync with sshd_config
[ssh-keygen.c]
- enable ssh-keygen -l -f ~/.ssh/known_hosts, ok deraadt@
[ssh.1]
- Change invalid 'CHAT' loglevel to 'VERBOSE'
[ssh.c]
- suppress AAAA query host when '-4' is used; from shin@nd.net.fujitsu.co.jp
- turn off x11-fwd for the client, too.
[sshconnect.c]
- missing xfree()
- retry rresvport_af(), too. from sumikawa@ebina.hitachi.co.jp.
- read error vs. "Connection closed by remote host"
[sshd.8]
- ie. -> i.e.,
- do not link to a commercial page..
- sync with sshd_config
[sshd.c]
- no need for poll.h; from bright@wintelcom.net
- log with level log() not fatal() if peer behaves badly.
- don't panic if client behaves strange. ok deraadt@
- make no-port-forwarding for RSA keys deny both -L and -R style fwding
- delay close() of pty until the pty has been chowned back to root
- oops, fix comment, too.
- missing xfree()
- move XAUTHORITY to subdir. ok dugsong@. fixes debian bug #57907, too.
(http://cgi.debian.org/cgi-bin/bugreport.cgi?archive=no&bug=57907)
- register cleanup for pty earlier. move code for pty-owner handling to
pty.c ok provos@, dugsong@
- create x11 cookie file
- fix pr 1113, fclose() -> pclose(), todo: remote popen()
- version 1.2.3
- Cleaned up
Diffstat (limited to 'ssh.c')
-rw-r--r-- | ssh.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -11,7 +11,7 @@ | |||
11 | */ | 11 | */ |
12 | 12 | ||
13 | #include "includes.h" | 13 | #include "includes.h" |
14 | RCSID("$Id: ssh.c,v 1.20 2000/03/02 12:09:21 damien Exp $"); | 14 | RCSID("$Id: ssh.c,v 1.21 2000/03/09 10:27:52 damien Exp $"); |
15 | 15 | ||
16 | #include "xmalloc.h" | 16 | #include "xmalloc.h" |
17 | #include "ssh.h" | 17 | #include "ssh.h" |
@@ -103,6 +103,7 @@ usage() | |||
103 | fprintf(stderr, " -k Disable Kerberos ticket and AFS token forwarding.\n"); | 103 | fprintf(stderr, " -k Disable Kerberos ticket and AFS token forwarding.\n"); |
104 | #endif /* AFS */ | 104 | #endif /* AFS */ |
105 | fprintf(stderr, " -x Disable X11 connection forwarding.\n"); | 105 | fprintf(stderr, " -x Disable X11 connection forwarding.\n"); |
106 | fprintf(stderr, " -X Enable X11 connection forwarding.\n"); | ||
106 | fprintf(stderr, " -i file Identity for RSA authentication (default: ~/.ssh/identity).\n"); | 107 | fprintf(stderr, " -i file Identity for RSA authentication (default: ~/.ssh/identity).\n"); |
107 | fprintf(stderr, " -t Tty; allocate a tty even if command is given.\n"); | 108 | fprintf(stderr, " -t Tty; allocate a tty even if command is given.\n"); |
108 | fprintf(stderr, " -v Verbose; display verbose debugging messages.\n"); | 109 | fprintf(stderr, " -v Verbose; display verbose debugging messages.\n"); |
@@ -497,7 +498,7 @@ main(int ac, char **av) | |||
497 | struct addrinfo *ai = NULL; | 498 | struct addrinfo *ai = NULL; |
498 | int errgai; | 499 | int errgai; |
499 | memset(&hints, 0, sizeof(hints)); | 500 | memset(&hints, 0, sizeof(hints)); |
500 | hints.ai_family = AF_UNSPEC; | 501 | hints.ai_family = IPv4or6; |
501 | hints.ai_flags = AI_CANONNAME; | 502 | hints.ai_flags = AI_CANONNAME; |
502 | hints.ai_socktype = SOCK_STREAM; | 503 | hints.ai_socktype = SOCK_STREAM; |
503 | errgai = getaddrinfo(host, NULL, &hints, &ai); | 504 | errgai = getaddrinfo(host, NULL, &hints, &ai); |