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 /fake-getnameinfo.c | |
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 'fake-getnameinfo.c')
-rw-r--r-- | fake-getnameinfo.c | 61 |
1 files changed, 61 insertions, 0 deletions
diff --git a/fake-getnameinfo.c b/fake-getnameinfo.c new file mode 100644 index 000000000..bf1184e24 --- /dev/null +++ b/fake-getnameinfo.c | |||
@@ -0,0 +1,61 @@ | |||
1 | /* | ||
2 | * fake library for ssh | ||
3 | * | ||
4 | * This file includes getnameinfo(). | ||
5 | * These funtions are defined in rfc2133. | ||
6 | * | ||
7 | * But these functions are not implemented correctly. The minimum subset | ||
8 | * is implemented for ssh use only. For exapmle, this routine assumes | ||
9 | * that ai_family is AF_INET. Don't use it for another purpose. | ||
10 | * | ||
11 | * In the case not using 'configure --enable-ipv6', this getnameinfo.c | ||
12 | * will be used if you have broken getnameinfo or no getnameinfo. | ||
13 | */ | ||
14 | |||
15 | #include "includes.h" | ||
16 | #include "ssh.h" | ||
17 | |||
18 | #ifndef HAVE_GETNAMEINFO | ||
19 | int | ||
20 | getnameinfo(sa, salen, host, hostlen, serv, servlen, flags) | ||
21 | const struct sockaddr *sa; | ||
22 | size_t salen; | ||
23 | char *host; | ||
24 | size_t hostlen; | ||
25 | char *serv; | ||
26 | size_t servlen; | ||
27 | int flags; | ||
28 | { | ||
29 | struct sockaddr_in *sin = (struct sockaddr_in *)sa; | ||
30 | struct hostent *hp; | ||
31 | char tmpserv[16]; | ||
32 | |||
33 | if (serv) { | ||
34 | sprintf(tmpserv, "%d", ntohs(sin->sin_port)); | ||
35 | if (strlen(tmpserv) > servlen) | ||
36 | return EAI_MEMORY; | ||
37 | else | ||
38 | strcpy(serv, tmpserv); | ||
39 | } | ||
40 | if (host) | ||
41 | if (flags & NI_NUMERICHOST) | ||
42 | if (strlen(inet_ntoa(sin->sin_addr)) > hostlen) | ||
43 | return EAI_MEMORY; | ||
44 | else { | ||
45 | strcpy(host, inet_ntoa(sin->sin_addr)); | ||
46 | return 0; | ||
47 | } | ||
48 | else | ||
49 | if (hp = gethostbyaddr((char *)&sin->sin_addr, sizeof(struct in_addr), | ||
50 | AF_INET)) | ||
51 | if (strlen(hp->h_name) > hostlen) | ||
52 | return EAI_MEMORY; | ||
53 | else { | ||
54 | strcpy(host, hp->h_name); | ||
55 | return 0; | ||
56 | } | ||
57 | else | ||
58 | return EAI_NODATA; | ||
59 | return 0; | ||
60 | } | ||
61 | #endif /* !HAVE_GETNAMEINFO */ | ||