diff options
author | Damien Miller <djm@mindrot.org> | 2000-01-14 15:45:46 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-01-14 15:45:46 +1100 |
commit | 34132e54cbd221d17d373fc54f4e3f7b85727f7f (patch) | |
tree | 7c73917b1082ff91786f9e02d25b853bedd1d472 /includes.h | |
parent | 25e4256ad4f453d8a7c1866243ec1984f859b1de (diff) |
- Merged OpenBSD IPv6 patch:
- [sshd.c sshd.8 sshconnect.c ssh.h ssh.c servconf.h servconf.c scp.1]
[scp.c packet.h packet.c login.c log.c canohost.c channels.c]
[hostfile.c sshd_config]
ipv6 support: mostly gethostbyname->getaddrinfo/getnameinfo, new
features: sshd allows multiple ListenAddress and Port options. note
that libwrap is not IPv6-ready. (based on patches from
fujiwara@rcac.tdi.co.jp)
- [ssh.c canohost.c]
more hints (hints.ai_socktype=SOCK_STREAM) for getaddrinfo,
from itojun@
- [channels.c]
listen on _all_ interfaces for X11-Fwd (hints.ai_flags = AI_PASSIVE)
- [packet.h]
allow auth-kerberos for IPv4 only
- [scp.1 sshd.8 servconf.h scp.c]
document -4, -6, and 'ssh -L 2022/::1/22'
- [ssh.c]
'ssh @host' is illegal (null user name), from
karsten@gedankenpolizei.de
- [sshconnect.c]
better error message
- [sshd.c]
allow auth-kerberos for IPv4 only
- Big IPv6 merge:
- Cleanup overrun in sockaddr copying on RHL 6.1
- Replacements for getaddrinfo, getnameinfo, etc based on versions
from patch from KIKUCHI Takahiro <kick@kyoto.wide.ad.jp>
- Replacement for missing structures on systems that lack IPv6
- record_login needed to know about AF_INET6 addresses
- Borrowed more code from OpenBSD: rresvport_af and requisites
Diffstat (limited to 'includes.h')
-rw-r--r-- | includes.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/includes.h b/includes.h index bc7db419a..b4af0c220 100644 --- a/includes.h +++ b/includes.h | |||
@@ -88,6 +88,10 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } | |||
88 | #endif | 88 | #endif |
89 | 89 | ||
90 | #include "version.h" | 90 | #include "version.h" |
91 | |||
92 | /* BSD function replacements */ | ||
93 | #include "bsd-bindresvport.h" | ||
94 | #include "bsd-rresvport.h" | ||
91 | #include "bsd-misc.h" | 95 | #include "bsd-misc.h" |
92 | #include "bsd-strlcpy.h" | 96 | #include "bsd-strlcpy.h" |
93 | #include "bsd-strlcat.h" | 97 | #include "bsd-strlcat.h" |
@@ -96,6 +100,11 @@ static /**/const char *const rcsid[] = { (char *)rcsid, "\100(#)" msg } | |||
96 | #include "bsd-daemon.h" | 100 | #include "bsd-daemon.h" |
97 | #include "bsd-login.h" | 101 | #include "bsd-login.h" |
98 | 102 | ||
103 | /* rfc2553 socket API replacements */ | ||
104 | #include "fake-getaddrinfo.h" | ||
105 | #include "fake-getnameinfo.h" | ||
106 | #include "fake-socket.h" | ||
107 | |||
99 | /* Define this to be the path of the xauth program. */ | 108 | /* Define this to be the path of the xauth program. */ |
100 | #ifndef XAUTH_PATH | 109 | #ifndef XAUTH_PATH |
101 | #define XAUTH_PATH "/usr/X11R6/bin/xauth" | 110 | #define XAUTH_PATH "/usr/X11R6/bin/xauth" |