diff options
author | Tim Rice <tim@multitalents.net> | 2001-08-07 15:29:07 -0700 |
---|---|---|
committer | Tim Rice <tim@multitalents.net> | 2001-08-07 15:29:07 -0700 |
commit | e991e3cf221c9f898b7ec0c5e7492bb1202cefc4 (patch) | |
tree | be55c57e75269fb299f9cbcf32a5c0ab58cfd2b4 | |
parent | 6db66ff3877f52110cda3104e798d91091af7200 (diff) |
- (tim) [configure.in sshconnect.c openbsd-compat/Makefile.in
openbsd-compat/openbsd-compat.h ] Add inet_ntop.c inet_ntop.h back
in. Needed for sshconnect.c
[sshconnect.c] fix INET6_ADDRSTRLEN for non IPv6 machines
[configure.in] make tests with missing libraries fail
patch by Wendy Palm <wendyp@cray.com>
Added openbsd-compat/bsd-cray.h. Selective patches from
William L. Jones <jones@mail.utexas.edu>
-rw-r--r-- | ChangeLog | 12 | ||||
-rw-r--r-- | configure.in | 14 | ||||
-rw-r--r-- | openbsd-compat/Makefile.in | 4 | ||||
-rw-r--r-- | openbsd-compat/bsd-cray.h | 13 | ||||
-rw-r--r-- | openbsd-compat/inet_ntop.c | 211 | ||||
-rw-r--r-- | openbsd-compat/inet_ntop.h | 13 | ||||
-rw-r--r-- | openbsd-compat/openbsd-compat.h | 3 | ||||
-rw-r--r-- | sshconnect.c | 4 |
8 files changed, 263 insertions, 11 deletions
@@ -1,3 +1,13 @@ | |||
1 | 20010807 | ||
2 | - (tim) [configure.in sshconnect.c openbsd-compat/Makefile.in | ||
3 | openbsd-compat/openbsd-compat.h ] Add inet_ntop.c inet_ntop.h back | ||
4 | in. Needed for sshconnect.c | ||
5 | [sshconnect.c] fix INET6_ADDRSTRLEN for non IPv6 machines | ||
6 | [configure.in] make tests with missing libraries fail | ||
7 | patch by Wendy Palm <wendyp@cray.com> | ||
8 | Added openbsd-compat/bsd-cray.h. Selective patches from | ||
9 | William L. Jones <jones@mail.utexas.edu> | ||
10 | |||
1 | 20010806 | 11 | 20010806 |
2 | - OpenBSD CVS Sync | 12 | - OpenBSD CVS Sync |
3 | - markus@cvs.openbsd.org 2001/07/22 21:32:27 | 13 | - markus@cvs.openbsd.org 2001/07/22 21:32:27 |
@@ -6260,4 +6270,4 @@ | |||
6260 | - Wrote replacements for strlcpy and mkdtemp | 6270 | - Wrote replacements for strlcpy and mkdtemp |
6261 | - Released 1.0pre1 | 6271 | - Released 1.0pre1 |
6262 | 6272 | ||
6263 | $Id: ChangeLog,v 1.1467 2001/08/06 23:29:16 mouring Exp $ | 6273 | $Id: ChangeLog,v 1.1468 2001/08/07 22:29:07 tim Exp $ |
diff --git a/configure.in b/configure.in index 4210d3e94..28843226d 100644 --- a/configure.in +++ b/configure.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: configure.in,v 1.305 2001/08/06 23:29:17 mouring Exp $ | 1 | # $Id: configure.in,v 1.306 2001/08/07 22:29:08 tim Exp $ |
2 | 2 | ||
3 | AC_INIT(ssh.c) | 3 | AC_INIT(ssh.c) |
4 | 4 | ||
@@ -242,12 +242,12 @@ mips-sony-bsd|mips-sony-newsos4) | |||
242 | MANTYPE=man | 242 | MANTYPE=man |
243 | ;; | 243 | ;; |
244 | *-*-unicos*) | 244 | *-*-unicos*) |
245 | no_libsocket=1 | 245 | no_libsocket=1 |
246 | no_libnsl=1 | 246 | no_libnsl=1 |
247 | AC_DEFINE(USE_PIPES) | 247 | AC_DEFINE(USE_PIPES) |
248 | LDFLAGS="$LDFLAGS -L/usr/local/lib" | 248 | LDFLAGS="$LDFLAGS -Wl,-Dmsglevel=334:fatal,-L/usr/local/lib" |
249 | LIBS="$LIBS -lgen -lrsc" | 249 | LIBS="$LIBS -lgen -lrsc" |
250 | ;; | 250 | ;; |
251 | *-dec-osf*) | 251 | *-dec-osf*) |
252 | AC_MSG_CHECKING(for Digital Unix SIA) | 252 | AC_MSG_CHECKING(for Digital Unix SIA) |
253 | no_osfsia="" | 253 | no_osfsia="" |
@@ -469,7 +469,7 @@ AC_ARG_WITH(tcp-wrappers, | |||
469 | ) | 469 | ) |
470 | 470 | ||
471 | dnl Checks for library functions. | 471 | dnl Checks for library functions. |
472 | AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_sa clock dirname fchown fchmod freeaddrinfo futimes gai_strerror getcwd getaddrinfo getgrouplist getopt getnameinfo getrlimit getrusage getttyent glob inet_aton inet_ntoa innetgr login_getcapbool md5_crypt memmove mkdtemp on_exit openpty readpassphrase realpath rresvport_af setdtablesize setenv setegid seteuid setlogin setproctitle setresgid setreuid setrlimit setsid setvbuf sigaction sigvec snprintf strerror strlcat strlcpy strmode strsep sysconf tcgetpgrp utimes vsnprintf vhangup vis waitpid _getpty __b64_ntop) | 472 | AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_sa clock dirname fchown fchmod freeaddrinfo futimes gai_strerror getcwd getaddrinfo getgrouplist getopt getnameinfo getrlimit getrusage getttyent glob inet_aton inet_ntoa inet_ntop innetgr login_getcapbool md5_crypt memmove mkdtemp on_exit openpty readpassphrase realpath rresvport_af setdtablesize setenv setegid seteuid setlogin setproctitle setresgid setreuid setrlimit setsid setvbuf sigaction sigvec snprintf strerror strlcat strlcpy strmode strsep sysconf tcgetpgrp utimes vsnprintf vhangup vis waitpid _getpty __b64_ntop) |
473 | dnl Checks for time functions | 473 | dnl Checks for time functions |
474 | AC_CHECK_FUNCS(gettimeofday time) | 474 | AC_CHECK_FUNCS(gettimeofday time) |
475 | dnl Checks for libutil functions | 475 | dnl Checks for libutil functions |
diff --git a/openbsd-compat/Makefile.in b/openbsd-compat/Makefile.in index 8ce35e531..c6b3c959e 100644 --- a/openbsd-compat/Makefile.in +++ b/openbsd-compat/Makefile.in | |||
@@ -1,4 +1,4 @@ | |||
1 | # $Id: Makefile.in,v 1.17 2001/07/22 19:32:01 mouring Exp $ | 1 | # $Id: Makefile.in,v 1.18 2001/08/07 22:29:09 tim Exp $ |
2 | 2 | ||
3 | sysconfdir=@sysconfdir@ | 3 | sysconfdir=@sysconfdir@ |
4 | piddir=@piddir@ | 4 | piddir=@piddir@ |
@@ -16,7 +16,7 @@ RANLIB=@RANLIB@ | |||
16 | INSTALL=@INSTALL@ | 16 | INSTALL=@INSTALL@ |
17 | LDFLAGS=-L. @LDFLAGS@ | 17 | LDFLAGS=-L. @LDFLAGS@ |
18 | 18 | ||
19 | OPENBSD=base64.o bindresvport.o daemon.o dirname.o getcwd.o getgrouplist.o getopt.o glob.o inet_aton.o inet_ntoa.o mktemp.o readpassphrase.o realpath.o rresvport.o setenv.o setproctitle.o sigact.o strlcat.o strlcpy.o strmode.o strsep.o vis.o | 19 | OPENBSD=base64.o bindresvport.o daemon.o dirname.o getcwd.o getgrouplist.o getopt.o glob.o inet_aton.o inet_ntoa.o inet_ntop.o mktemp.o readpassphrase.o realpath.o rresvport.o setenv.o setproctitle.o sigact.o strlcat.o strlcpy.o strmode.o strsep.o vis.o |
20 | 20 | ||
21 | COMPAT=bsd-arc4random.o bsd-cray.o bsd-cygwin_util.o bsd-misc.o bsd-nextstep.o bsd-snprintf.o bsd-waitpid.o fake-getaddrinfo.o fake-getnameinfo.o | 21 | COMPAT=bsd-arc4random.o bsd-cray.o bsd-cygwin_util.o bsd-misc.o bsd-nextstep.o bsd-snprintf.o bsd-waitpid.o fake-getaddrinfo.o fake-getnameinfo.o |
22 | 22 | ||
diff --git a/openbsd-compat/bsd-cray.h b/openbsd-compat/bsd-cray.h new file mode 100644 index 000000000..4ca2dbe51 --- /dev/null +++ b/openbsd-compat/bsd-cray.h | |||
@@ -0,0 +1,13 @@ | |||
1 | |||
2 | #ifndef _BSD_CRAY_H | ||
3 | #define _BSD_CRAY_H | ||
4 | |||
5 | #ifdef _CRAY | ||
6 | void cray_init_job(struct passwd *); /* init cray job */ | ||
7 | void cray_job_termination_handler(int); /* process end of job signal */ | ||
8 | void cray_setup(uid_t, char *); /* set cray limits */ | ||
9 | extern char cray_tmpdir[]; /* cray tmpdir */ | ||
10 | #endif | ||
11 | |||
12 | |||
13 | #endif /* _BSD_CRAY_H */ | ||
diff --git a/openbsd-compat/inet_ntop.c b/openbsd-compat/inet_ntop.c new file mode 100644 index 000000000..bf3d97ade --- /dev/null +++ b/openbsd-compat/inet_ntop.c | |||
@@ -0,0 +1,211 @@ | |||
1 | /* $OpenBSD: inet_ntop.c,v 1.1 1997/03/13 19:07:32 downsj Exp $ */ | ||
2 | |||
3 | /* Copyright (c) 1996 by Internet Software Consortium. | ||
4 | * | ||
5 | * Permission to use, copy, modify, and distribute this software for any | ||
6 | * purpose with or without fee is hereby granted, provided that the above | ||
7 | * copyright notice and this permission notice appear in all copies. | ||
8 | * | ||
9 | * THE SOFTWARE IS PROVIDED "AS IS" AND INTERNET SOFTWARE CONSORTIUM DISCLAIMS | ||
10 | * ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES | ||
11 | * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL INTERNET SOFTWARE | ||
12 | * CONSORTIUM BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL | ||
13 | * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR | ||
14 | * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS | ||
15 | * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS | ||
16 | * SOFTWARE. | ||
17 | */ | ||
18 | |||
19 | #include "config.h" | ||
20 | |||
21 | #ifndef HAVE_INET_NTOP | ||
22 | |||
23 | #if defined(LIBC_SCCS) && !defined(lint) | ||
24 | #if 0 | ||
25 | static char rcsid[] = "$From: inet_ntop.c,v 8.7 1996/08/05 08:41:18 vixie Exp $"; | ||
26 | #else | ||
27 | static char rcsid[] = "$OpenBSD: inet_ntop.c,v 1.1 1997/03/13 19:07:32 downsj Exp $"; | ||
28 | #endif | ||
29 | #endif /* LIBC_SCCS and not lint */ | ||
30 | |||
31 | #include <sys/param.h> | ||
32 | #include <sys/types.h> | ||
33 | #include <sys/socket.h> | ||
34 | #include "openbsd-compat/fake-socket.h" | ||
35 | #include <netinet/in.h> | ||
36 | #include <arpa/inet.h> | ||
37 | #ifndef HAVE_CYGWIN | ||
38 | #include <arpa/nameser.h> | ||
39 | #endif | ||
40 | #include <string.h> | ||
41 | #include <errno.h> | ||
42 | #include <stdio.h> | ||
43 | |||
44 | #ifndef IN6ADDRSZ | ||
45 | #define IN6ADDRSZ 16 /* IPv6 T_AAAA */ | ||
46 | #endif | ||
47 | |||
48 | #ifndef INT16SZ | ||
49 | #define INT16SZ 2 /* for systems without 16-bit ints */ | ||
50 | #endif | ||
51 | |||
52 | /* | ||
53 | * WARNING: Don't even consider trying to compile this on a system where | ||
54 | * sizeof(int) < 4. sizeof(int) > 4 is fine; all the world's not a VAX. | ||
55 | */ | ||
56 | |||
57 | static const char *inet_ntop4 __P((const u_char *src, char *dst, size_t size)); | ||
58 | static const char *inet_ntop6 __P((const u_char *src, char *dst, size_t size)); | ||
59 | |||
60 | /* char * | ||
61 | * inet_ntop(af, src, dst, size) | ||
62 | * convert a network format address to presentation format. | ||
63 | * return: | ||
64 | * pointer to presentation format address (`dst'), or NULL (see errno). | ||
65 | * author: | ||
66 | * Paul Vixie, 1996. | ||
67 | */ | ||
68 | const char * | ||
69 | inet_ntop(af, src, dst, size) | ||
70 | int af; | ||
71 | const void *src; | ||
72 | char *dst; | ||
73 | size_t size; | ||
74 | { | ||
75 | switch (af) { | ||
76 | case AF_INET: | ||
77 | return (inet_ntop4(src, dst, size)); | ||
78 | case AF_INET6: | ||
79 | return (inet_ntop6(src, dst, size)); | ||
80 | default: | ||
81 | errno = EAFNOSUPPORT; | ||
82 | return (NULL); | ||
83 | } | ||
84 | /* NOTREACHED */ | ||
85 | } | ||
86 | |||
87 | /* const char * | ||
88 | * inet_ntop4(src, dst, size) | ||
89 | * format an IPv4 address, more or less like inet_ntoa() | ||
90 | * return: | ||
91 | * `dst' (as a const) | ||
92 | * notes: | ||
93 | * (1) uses no statics | ||
94 | * (2) takes a u_char* not an in_addr as input | ||
95 | * author: | ||
96 | * Paul Vixie, 1996. | ||
97 | */ | ||
98 | static const char * | ||
99 | inet_ntop4(src, dst, size) | ||
100 | const u_char *src; | ||
101 | char *dst; | ||
102 | size_t size; | ||
103 | { | ||
104 | static const char fmt[] = "%u.%u.%u.%u"; | ||
105 | char tmp[sizeof "255.255.255.255"]; | ||
106 | |||
107 | if (sprintf(tmp, fmt, src[0], src[1], src[2], src[3]) > size) { | ||
108 | errno = ENOSPC; | ||
109 | return (NULL); | ||
110 | } | ||
111 | strcpy(dst, tmp); | ||
112 | return (dst); | ||
113 | } | ||
114 | |||
115 | /* const char * | ||
116 | * inet_ntop6(src, dst, size) | ||
117 | * convert IPv6 binary address into presentation (printable) format | ||
118 | * author: | ||
119 | * Paul Vixie, 1996. | ||
120 | */ | ||
121 | static const char * | ||
122 | inet_ntop6(src, dst, size) | ||
123 | const u_char *src; | ||
124 | char *dst; | ||
125 | size_t size; | ||
126 | { | ||
127 | /* | ||
128 | * Note that int32_t and int16_t need only be "at least" large enough | ||
129 | * to contain a value of the specified size. On some systems, like | ||
130 | * Crays, there is no such thing as an integer variable with 16 bits. | ||
131 | * Keep this in mind if you think this function should have been coded | ||
132 | * to use pointer overlays. All the world's not a VAX. | ||
133 | */ | ||
134 | char tmp[sizeof "ffff:ffff:ffff:ffff:ffff:ffff:255.255.255.255"], *tp; | ||
135 | struct { int base, len; } best, cur; | ||
136 | u_int words[IN6ADDRSZ / INT16SZ]; | ||
137 | int i; | ||
138 | |||
139 | /* | ||
140 | * Preprocess: | ||
141 | * Copy the input (bytewise) array into a wordwise array. | ||
142 | * Find the longest run of 0x00's in src[] for :: shorthanding. | ||
143 | */ | ||
144 | memset(words, '\0', sizeof words); | ||
145 | for (i = 0; i < IN6ADDRSZ; i++) | ||
146 | words[i / 2] |= (src[i] << ((1 - (i % 2)) << 3)); | ||
147 | best.base = -1; | ||
148 | cur.base = -1; | ||
149 | for (i = 0; i < (IN6ADDRSZ / INT16SZ); i++) { | ||
150 | if (words[i] == 0) { | ||
151 | if (cur.base == -1) | ||
152 | cur.base = i, cur.len = 1; | ||
153 | else | ||
154 | cur.len++; | ||
155 | } else { | ||
156 | if (cur.base != -1) { | ||
157 | if (best.base == -1 || cur.len > best.len) | ||
158 | best = cur; | ||
159 | cur.base = -1; | ||
160 | } | ||
161 | } | ||
162 | } | ||
163 | if (cur.base != -1) { | ||
164 | if (best.base == -1 || cur.len > best.len) | ||
165 | best = cur; | ||
166 | } | ||
167 | if (best.base != -1 && best.len < 2) | ||
168 | best.base = -1; | ||
169 | |||
170 | /* | ||
171 | * Format the result. | ||
172 | */ | ||
173 | tp = tmp; | ||
174 | for (i = 0; i < (IN6ADDRSZ / INT16SZ); i++) { | ||
175 | /* Are we inside the best run of 0x00's? */ | ||
176 | if (best.base != -1 && i >= best.base && | ||
177 | i < (best.base + best.len)) { | ||
178 | if (i == best.base) | ||
179 | *tp++ = ':'; | ||
180 | continue; | ||
181 | } | ||
182 | /* Are we following an initial run of 0x00s or any real hex? */ | ||
183 | if (i != 0) | ||
184 | *tp++ = ':'; | ||
185 | /* Is this address an encapsulated IPv4? */ | ||
186 | if (i == 6 && best.base == 0 && | ||
187 | (best.len == 6 || (best.len == 5 && words[5] == 0xffff))) { | ||
188 | if (!inet_ntop4(src+12, tp, sizeof tmp - (tp - tmp))) | ||
189 | return (NULL); | ||
190 | tp += strlen(tp); | ||
191 | break; | ||
192 | } | ||
193 | tp += sprintf(tp, "%x", words[i]); | ||
194 | } | ||
195 | /* Was it a trailing run of 0x00's? */ | ||
196 | if (best.base != -1 && (best.base + best.len) == (IN6ADDRSZ / INT16SZ)) | ||
197 | *tp++ = ':'; | ||
198 | *tp++ = '\0'; | ||
199 | |||
200 | /* | ||
201 | * Check for overflow, copy, and we're done. | ||
202 | */ | ||
203 | if ((size_t)(tp - tmp) > size) { | ||
204 | errno = ENOSPC; | ||
205 | return (NULL); | ||
206 | } | ||
207 | strcpy(dst, tmp); | ||
208 | return (dst); | ||
209 | } | ||
210 | |||
211 | #endif /* !HAVE_INET_NTOP */ | ||
diff --git a/openbsd-compat/inet_ntop.h b/openbsd-compat/inet_ntop.h new file mode 100644 index 000000000..ab0f14835 --- /dev/null +++ b/openbsd-compat/inet_ntop.h | |||
@@ -0,0 +1,13 @@ | |||
1 | /* $Id: inet_ntop.h,v 1.3 2001/08/07 22:29:10 tim Exp $ */ | ||
2 | |||
3 | #ifndef _BSD_RRESVPORT_H | ||
4 | #define _BSD_RRESVPORT_H | ||
5 | |||
6 | #include "config.h" | ||
7 | |||
8 | #ifndef HAVE_INET_NTOP | ||
9 | const char * | ||
10 | inet_ntop(int af, const void *src, char *dst, size_t size); | ||
11 | #endif /* !HAVE_INET_NTOP */ | ||
12 | |||
13 | #endif /* _BSD_RRESVPORT_H */ | ||
diff --git a/openbsd-compat/openbsd-compat.h b/openbsd-compat/openbsd-compat.h index ab07315b6..eba9ca051 100644 --- a/openbsd-compat/openbsd-compat.h +++ b/openbsd-compat/openbsd-compat.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $Id: openbsd-compat.h,v 1.12 2001/08/06 23:29:18 mouring Exp $ */ | 1 | /* $Id: openbsd-compat.h,v 1.13 2001/08/07 22:29:09 tim Exp $ */ |
2 | 2 | ||
3 | #ifndef _OPENBSD_H | 3 | #ifndef _OPENBSD_H |
4 | #define _OPENBSD_H | 4 | #define _OPENBSD_H |
@@ -19,6 +19,7 @@ | |||
19 | #include "base64.h" | 19 | #include "base64.h" |
20 | #include "sigact.h" | 20 | #include "sigact.h" |
21 | #include "inet_ntoa.h" | 21 | #include "inet_ntoa.h" |
22 | #include "inet_ntop.h" | ||
22 | #include "strsep.h" | 23 | #include "strsep.h" |
23 | #include "vis.h" | 24 | #include "vis.h" |
24 | #include "setproctitle.h" | 25 | #include "setproctitle.h" |
diff --git a/sshconnect.c b/sshconnect.c index 27b338719..0ae100fed 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -41,6 +41,10 @@ extern char *__progname; | |||
41 | /* AF_UNSPEC or AF_INET or AF_INET6 */ | 41 | /* AF_UNSPEC or AF_INET or AF_INET6 */ |
42 | extern int IPv4or6; | 42 | extern int IPv4or6; |
43 | 43 | ||
44 | #ifndef INET6_ADDRSTRLEN /* for non IPv6 machines */ | ||
45 | #define INET6_ADDRSTRLEN 46 | ||
46 | #endif | ||
47 | |||
44 | static const char * | 48 | static const char * |
45 | sockaddr_ntop(struct sockaddr *sa) | 49 | sockaddr_ntop(struct sockaddr *sa) |
46 | { | 50 | { |