summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog3
-rw-r--r--configure.in4
-rw-r--r--openbsd-compat/inet_ntop.c211
-rw-r--r--openbsd-compat/inet_ntop.h13
-rw-r--r--openbsd-compat/strtok.c92
-rw-r--r--openbsd-compat/strtok.h12
6 files changed, 4 insertions, 331 deletions
diff --git a/ChangeLog b/ChangeLog
index 923ccff14..ef6833e9f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
2 - (djm) Sync openbsd-compat with -current libc 2 - (djm) Sync openbsd-compat with -current libc
3 - (djm) Fix from Lutz Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE> for my 3 - (djm) Fix from Lutz Jaenicke <Lutz.Jaenicke@aet.TU-Cottbus.DE> for my
4 broken makefile 4 broken makefile
5 - (bal) Removed strtok_r and inet_ntop since they are no longer used.
5 6
620010627 720010627
7 - (djm) Reintroduce pam_session call for non-pty sessions. 8 - (djm) Reintroduce pam_session call for non-pty sessions.
@@ -5814,4 +5815,4 @@
5814 - Wrote replacements for strlcpy and mkdtemp 5815 - Wrote replacements for strlcpy and mkdtemp
5815 - Released 1.0pre1 5816 - Released 1.0pre1
5816 5817
5817$Id: ChangeLog,v 1.1336 2001/06/28 10:23:14 djm Exp $ 5818$Id: ChangeLog,v 1.1337 2001/06/28 23:21:28 mouring Exp $
diff --git a/configure.in b/configure.in
index f358f60a7..c682528d0 100644
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
1# $Id: configure.in,v 1.295 2001/06/28 00:24:42 stevesk Exp $ 1# $Id: configure.in,v 1.296 2001/06/28 23:21:29 mouring Exp $
2 2
3AC_INIT(ssh.c) 3AC_INIT(ssh.c)
4 4
@@ -459,7 +459,7 @@ AC_ARG_WITH(tcp-wrappers,
459) 459)
460 460
461dnl Checks for library functions. 461dnl Checks for library functions.
462AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_sa clock dirname fchown fchmod freeaddrinfo futimes gai_strerror getcwd getaddrinfo getgrouplist getnameinfo getrlimit getrusage getttyent getusershell 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 strtok_r sysconf tcgetpgrp utimes vsnprintf vhangup vis waitpid _getpty __b64_ntop) 462AC_CHECK_FUNCS(arc4random atexit b64_ntop bcopy bindresvport_sa clock dirname fchown fchmod freeaddrinfo futimes gai_strerror getcwd getaddrinfo getgrouplist getnameinfo getrlimit getrusage getttyent getusershell 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)
463dnl Checks for time functions 463dnl Checks for time functions
464AC_CHECK_FUNCS(gettimeofday time) 464AC_CHECK_FUNCS(gettimeofday time)
465dnl Checks for libutil functions 465dnl Checks for libutil functions
diff --git a/openbsd-compat/inet_ntop.c b/openbsd-compat/inet_ntop.c
deleted file mode 100644
index bf3d97ade..000000000
--- a/openbsd-compat/inet_ntop.c
+++ /dev/null
@@ -1,211 +0,0 @@
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
25static char rcsid[] = "$From: inet_ntop.c,v 8.7 1996/08/05 08:41:18 vixie Exp $";
26#else
27static 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
57static const char *inet_ntop4 __P((const u_char *src, char *dst, size_t size));
58static 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 */
68const char *
69inet_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 */
98static const char *
99inet_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 */
121static const char *
122inet_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
deleted file mode 100644
index 11f443ff3..000000000
--- a/openbsd-compat/inet_ntop.h
+++ /dev/null
@@ -1,13 +0,0 @@
1/* $Id: inet_ntop.h,v 1.1 2001/04/12 21:35:53 mouring Exp $ */
2
3#ifndef _BSD_RRESVPORT_H
4#define _BSD_RRESVPORT_H
5
6#include "config.h"
7
8#ifndef HAVE_INET_NTOP
9const char *
10inet_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/strtok.c b/openbsd-compat/strtok.c
deleted file mode 100644
index 6ce6f9a3c..000000000
--- a/openbsd-compat/strtok.c
+++ /dev/null
@@ -1,92 +0,0 @@
1/*
2 * Copyright (c) 1988 Regents of the University of California.
3 * All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution.
13 * 3. All advertising materials mentioning features or use of this software
14 * must display the following acknowledgement:
15 * This product includes software developed by the University of
16 * California, Berkeley and its contributors.
17 * 4. Neither the name of the University nor the names of its contributors
18 * may be used to endorse or promote products derived from this software
19 * without specific prior written permission.
20 *
21 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
22 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
23 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
24 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
25 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 */
33
34#include "config.h"
35
36#ifndef HAVE_STRTOK_R
37
38#include "strtok.h"
39
40#if defined(LIBC_SCCS) && !defined(lint)
41static char *rcsid = "$OpenBSD: strtok.c,v 1.3 1999/11/09 11:19:46 art Exp $";
42#endif /* LIBC_SCCS and not lint */
43
44#include <string.h>
45
46char *strtok_r(char *s, const char *delim, char **last)
47{
48 register char *spanp;
49 register int c, sc;
50 char *tok;
51
52 if (s == NULL && (s = *last) == NULL)
53 return (NULL);
54
55 /*
56 * Skip (span) leading delimiters (s += strspn(s, delim), sort of).
57 */
58cont:
59 c = *s++;
60 for (spanp = (char *)delim; (sc = *spanp++) != 0;) {
61 if (c == sc)
62 goto cont;
63 }
64
65 if (c == 0) { /* no non-delimiter characters */
66 *last = NULL;
67 return (NULL);
68 }
69 tok = s - 1;
70
71 /*
72 * Scan token (scan for delimiters: s += strcspn(s, delim), sort of).
73 * Note that delim must have one NUL; we stop if we see that, too.
74 */
75 for (;;) {
76 c = *s++;
77 spanp = (char *)delim;
78 do {
79 if ((sc = *spanp++) == c) {
80 if (c == 0)
81 s = NULL;
82 else
83 s[-1] = 0;
84 *last = s;
85 return (tok);
86 }
87 } while (sc != 0);
88 }
89 /* NOTREACHED */
90}
91
92#endif /* !HAVE_STRTOK_R */
diff --git a/openbsd-compat/strtok.h b/openbsd-compat/strtok.h
deleted file mode 100644
index 25db16acd..000000000
--- a/openbsd-compat/strtok.h
+++ /dev/null
@@ -1,12 +0,0 @@
1/* $Id: strtok.h,v 1.2 2001/02/09 01:55:36 djm Exp $ */
2
3#ifndef _BSD_STRTOK_H
4#define _BSD_STRTOK_H
5
6#include "config.h"
7
8#ifndef HAVE_STRTOK_R
9char *strtok_r(char *s, const char *delim, char **last);
10#endif /* HAVE_STRTOK_R */
11
12#endif /* _BSD_STRTOK_H */
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-05 02:34:25 +0000