summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--Makefile.in2
-rw-r--r--bsd-inet_aton.c193
-rw-r--r--bsd-inet_aton.h10
-rw-r--r--openbsd-compat.h1
5 files changed, 206 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f3b78fc07..99f47dece 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@
8 from Jim Watt <jimw@peisj.pebio.com> 8 from Jim Watt <jimw@peisj.pebio.com>
9 - (djm) Replaced bsd-snprintf.c with one from Mutt source tree, it is known 9 - (djm) Replaced bsd-snprintf.c with one from Mutt source tree, it is known
10 to compile on more platforms (incl NeXT). 10 to compile on more platforms (incl NeXT).
11 - (djm) Added bsd-inet_aton for NeXT
11 12
1220000709 1320000709
13 - (djm) Only enable PAM_TTY kludge for Linux. Problem report from 14 - (djm) Only enable PAM_TTY kludge for Linux. Problem report from
diff --git a/Makefile.in b/Makefile.in
index 9f1aea052..d8a3f4685 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -36,7 +36,7 @@ TARGETS=ssh sshd ssh-add ssh-keygen ssh-agent scp $(EXTRA_TARGETS)
36 36
37LIBSSH_OBJS=atomicio.o authfd.o authfile.o aux.o bufaux.o buffer.o canohost.o channels.o cipher.o compat.o compress.o crc32.o deattack.o dispatch.o dsa.o fingerprint.o hmac.o hostfile.o key.o kex.o log.o match.o mpaux.o nchan.o packet.o radix.o entropy.o readpass.o rsa.o tildexpand.o ttymodes.o uidswap.o uuencode.o xmalloc.o 37LIBSSH_OBJS=atomicio.o authfd.o authfile.o aux.o bufaux.o buffer.o canohost.o channels.o cipher.o compat.o compress.o crc32.o deattack.o dispatch.o dsa.o fingerprint.o hmac.o hostfile.o key.o kex.o log.o match.o mpaux.o nchan.o packet.o radix.o entropy.o readpass.o rsa.o tildexpand.o ttymodes.o uidswap.o uuencode.o xmalloc.o
38 38
39LIBOPENBSD_COMPAT_OBJS=bsd-base64.o bsd-bindresvport.o bsd-daemon.o bsd-misc.o bsd-mktemp.o bsd-rresvport.o bsd-setenv.o bsd-sigaction.o bsd-snprintf.o bsd-strlcat.o bsd-strlcpy.o fake-getaddrinfo.o fake-getnameinfo.o next-posix.o 39LIBOPENBSD_COMPAT_OBJS=bsd-base64.o bsd-bindresvport.o bsd-daemon.o bsd-inet_aton.o bsd-misc.o bsd-mktemp.o bsd-rresvport.o bsd-setenv.o bsd-sigaction.o bsd-snprintf.o bsd-strlcat.o bsd-strlcpy.o fake-getaddrinfo.o fake-getnameinfo.o next-posix.o
40 40
41SSHOBJS= ssh.o sshconnect.o sshconnect1.o sshconnect2.o log-client.o readconf.o clientloop.o 41SSHOBJS= ssh.o sshconnect.o sshconnect1.o sshconnect2.o log-client.o readconf.o clientloop.o
42 42
diff --git a/bsd-inet_aton.c b/bsd-inet_aton.c
new file mode 100644
index 000000000..2165155db
--- /dev/null
+++ b/bsd-inet_aton.c
@@ -0,0 +1,193 @@
1/* $OpenBSD: inet_addr.c,v 1.6 1999/05/03 22:31:14 yanick Exp $ */
2
3/*
4 * ++Copyright++ 1983, 1990, 1993
5 * -
6 * Copyright (c) 1983, 1990, 1993
7 * The Regents of the University of California. All rights reserved.
8 *
9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions
11 * are met:
12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright
15 * notice, this list of conditions and the following disclaimer in the
16 * documentation and/or other materials provided with the distribution.
17 * 3. All advertising materials mentioning features or use of this software
18 * must display the following acknowledgement:
19 * This product includes software developed by the University of
20 * California, Berkeley and its contributors.
21 * 4. Neither the name of the University nor the names of its contributors
22 * may be used to endorse or promote products derived from this software
23 * without specific prior written permission.
24 *
25 * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
26 * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
27 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
28 * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
29 * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
30 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
31 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
32 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
33 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
34 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
35 * SUCH DAMAGE.
36 * -
37 * Portions Copyright (c) 1993 by Digital Equipment Corporation.
38 *
39 * Permission to use, copy, modify, and distribute this software for any
40 * purpose with or without fee is hereby granted, provided that the above
41 * copyright notice and this permission notice appear in all copies, and that
42 * the name of Digital Equipment Corporation not be used in advertising or
43 * publicity pertaining to distribution of the document or software without
44 * specific, written prior permission.
45 *
46 * THE SOFTWARE IS PROVIDED "AS IS" AND DIGITAL EQUIPMENT CORP. DISCLAIMS ALL
47 * WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES
48 * OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL DIGITAL EQUIPMENT
49 * CORPORATION BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL
50 * DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR
51 * PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS
52 * ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
53 * SOFTWARE.
54 * -
55 * --Copyright--
56 */
57
58#include "config.h"
59
60#if !defined(HAVE_INET_ATON)
61
62#if defined(LIBC_SCCS) && !defined(lint)
63#if 0
64static char sccsid[] = "@(#)inet_addr.c 8.1 (Berkeley) 6/17/93";
65static char rcsid[] = "$From: inet_addr.c,v 8.5 1996/08/05 08:31:35 vixie Exp $";
66#else
67static char rcsid[] = "$OpenBSD: inet_addr.c,v 1.6 1999/05/03 22:31:14 yanick Exp $";
68#endif
69#endif /* LIBC_SCCS and not lint */
70
71#include <sys/types.h>
72#include <sys/param.h>
73#include <netinet/in.h>
74#include <arpa/inet.h>
75#include <ctype.h>
76
77#if 0
78/*
79 * Ascii internet address interpretation routine.
80 * The value returned is in network order.
81 */
82in_addr_t
83inet_addr(cp)
84 register const char *cp;
85{
86 struct in_addr val;
87
88 if (inet_aton(cp, &val))
89 return (val.s_addr);
90 return (INADDR_NONE);
91}
92#endif
93
94/*
95 * Check whether "cp" is a valid ascii representation
96 * of an Internet address and convert to a binary address.
97 * Returns 1 if the address is valid, 0 if not.
98 * This replaces inet_addr, the return value from which
99 * cannot distinguish between failure and a local broadcast address.
100 */
101int
102inet_aton(const char *cp, struct in_addr *addr)
103{
104 register in_addr_t val;
105 register int base, n;
106 register char c;
107 unsigned int parts[4];
108 register unsigned int *pp = parts;
109
110 c = *cp;
111 for (;;) {
112 /*
113 * Collect number up to ``.''.
114 * Values are specified as for C:
115 * 0x=hex, 0=octal, isdigit=decimal.
116 */
117 if (!isdigit(c))
118 return (0);
119 val = 0; base = 10;
120 if (c == '0') {
121 c = *++cp;
122 if (c == 'x' || c == 'X')
123 base = 16, c = *++cp;
124 else
125 base = 8;
126 }
127 for (;;) {
128 if (isascii(c) && isdigit(c)) {
129 val = (val * base) + (c - '0');
130 c = *++cp;
131 } else if (base == 16 && isascii(c) && isxdigit(c)) {
132 val = (val << 4) |
133 (c + 10 - (islower(c) ? 'a' : 'A'));
134 c = *++cp;
135 } else
136 break;
137 }
138 if (c == '.') {
139 /*
140 * Internet format:
141 * a.b.c.d
142 * a.b.c (with c treated as 16 bits)
143 * a.b (with b treated as 24 bits)
144 */
145 if (pp >= parts + 3)
146 return (0);
147 *pp++ = val;
148 c = *++cp;
149 } else
150 break;
151 }
152 /*
153 * Check for trailing characters.
154 */
155 if (c != '\0' && (!isascii(c) || !isspace(c)))
156 return (0);
157 /*
158 * Concoct the address according to
159 * the number of parts specified.
160 */
161 n = pp - parts + 1;
162 switch (n) {
163
164 case 0:
165 return (0); /* initial nondigit */
166
167 case 1: /* a -- 32 bits */
168 break;
169
170 case 2: /* a.b -- 8.24 bits */
171 if ((val > 0xffffff) || (parts[0] > 0xff))
172 return (0);
173 val |= parts[0] << 24;
174 break;
175
176 case 3: /* a.b.c -- 8.8.16 bits */
177 if ((val > 0xffff) || (parts[0] > 0xff) || (parts[1] > 0xff))
178 return (0);
179 val |= (parts[0] << 24) | (parts[1] << 16);
180 break;
181
182 case 4: /* a.b.c.d -- 8.8.8.8 bits */
183 if ((val > 0xff) || (parts[0] > 0xff) || (parts[1] > 0xff) || (parts[2] > 0xff))
184 return (0);
185 val |= (parts[0] << 24) | (parts[1] << 16) | (parts[2] << 8);
186 break;
187 }
188 if (addr)
189 addr->s_addr = htonl(val);
190 return (1);
191}
192
193#endif /* !defined(HAVE_INET_ATON) */
diff --git a/bsd-inet_aton.h b/bsd-inet_aton.h
new file mode 100644
index 000000000..b8e9674ba
--- /dev/null
+++ b/bsd-inet_aton.h
@@ -0,0 +1,10 @@
1#ifndef _BSD_INET_ATON_H
2#define _BSD_INET_ATON_H
3
4#include "config.h"
5
6#ifndef HAVE_INET_ATON
7int inet_aton(const char *cp, struct in_addr *addr)
8#endif /* HAVE_INET_ATON */
9
10#endif /* _BSD_INET_ATON_H */
diff --git a/openbsd-compat.h b/openbsd-compat.h
index 8fd85bc9d..f7a26122d 100644
--- a/openbsd-compat.h
+++ b/openbsd-compat.h
@@ -14,6 +14,7 @@
14#include "bsd-daemon.h" 14#include "bsd-daemon.h"
15#include "bsd-base64.h" 15#include "bsd-base64.h"
16#include "bsd-sigaction.h" 16#include "bsd-sigaction.h"
17#include "bsd-inet_aton.h"
17 18
18/* rfc2553 socket API replacements */ 19/* rfc2553 socket API replacements */
19#include "fake-getaddrinfo.h" 20#include "fake-getaddrinfo.h"