diff options
| author | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2001-05-01 07:40:05 +0000 |
|---|---|---|
| committer | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2001-05-01 07:40:05 +0000 |
| commit | 2ccedf6b72c2476dc4e27ea9232b17a0296fcc46 (patch) | |
| tree | 654725e587da23292ce1c50fc72e38e4229687eb | |
| parent | 51d33ff54f1f2ebaf794fe69c243d80da5586c55 (diff) | |
avodi null pointer dereference. sync with kame
| -rw-r--r-- | usr.sbin/faithd/README | 6 | ||||
| -rw-r--r-- | usr.sbin/faithd/faithd.8 | 6 | ||||
| -rw-r--r-- | usr.sbin/faithd/faithd.c | 15 |
3 files changed, 16 insertions, 11 deletions
diff --git a/usr.sbin/faithd/README b/usr.sbin/faithd/README index 1e308fba043..5bcf4fa288c 100644 --- a/usr.sbin/faithd/README +++ b/usr.sbin/faithd/README @@ -1,8 +1,8 @@ Configuring FAITH IPv6-to-IPv4 TCP relay Kazu Yamamoto and Jun-ichiro itojun Hagino -$OpenBSD: README,v 1.7 2000/09/16 10:33:43 itojun Exp $ -$KAME: README,v 1.6 2000/07/06 13:43:33 itojun Exp $ +$OpenBSD: README,v 1.8 2001/05/01 07:40:04 itojun Exp $ +$KAME: README,v 1.7 2001/04/25 11:25:19 itojun Exp $ Introduction @@ -34,7 +34,7 @@ FAITH will make it possible to make a IPv6 TCP connection From IPv6 node "src", toward IPv4 node "dest", by specifying FAITH-mapped address 3ffe:0501:ffff:0000::123.4.5.6 (which is, 3ffe:0501:ffff:0000:0000:0000:7b04:0506). -The address mapping can be performed by hand:-), by speical nameserver on +The address mapping can be performed by hand:-), by special nameserver on the network, or by special resolver on the source node. diff --git a/usr.sbin/faithd/faithd.8 b/usr.sbin/faithd/faithd.8 index b093238d946..e4ff123f3e8 100644 --- a/usr.sbin/faithd/faithd.8 +++ b/usr.sbin/faithd/faithd.8 @@ -1,5 +1,5 @@ -.\" $OpenBSD: faithd.8,v 1.13 2001/02/15 17:56:28 itojun Exp $ -.\" $KAME: faithd.8,v 1.26 2001/02/15 17:55:54 itojun Exp $ +.\" $OpenBSD: faithd.8,v 1.14 2001/05/01 07:40:04 itojun Exp $ +.\" $KAME: faithd.8,v 1.28 2001/04/25 11:24:15 itojun Exp $ .\" .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. .\" All rights reserved. @@ -333,7 +333,7 @@ on error. .%A Kazu Yamamoto .%T "An IPv6-to-IPv4 transport relay translator" .%R internet draft -.%N draft-ietf-ngtrans-tcpudp-relay-01.txt +.%N draft-ietf-ngtrans-tcpudp-relay-04.txt .%O work in progress material .Re .\" diff --git a/usr.sbin/faithd/faithd.c b/usr.sbin/faithd/faithd.c index 8bb6b8d5d85..5ecec25c634 100644 --- a/usr.sbin/faithd/faithd.c +++ b/usr.sbin/faithd/faithd.c @@ -1,5 +1,5 @@ -/* $OpenBSD: faithd.c,v 1.11 2001/03/20 01:13:54 itojun Exp $ */ -/* $KAME: faithd.c,v 1.38 2001/02/27 06:46:52 itojun Exp $ */ +/* $OpenBSD: faithd.c,v 1.12 2001/05/01 07:40:04 itojun Exp $ */ +/* $KAME: faithd.c,v 1.39 2001/04/25 11:20:42 itojun Exp $ */ /* * Copyright (C) 1997 and 1998 WIDE Project. @@ -554,9 +554,14 @@ play_child(int s_src, struct sockaddr *srcaddr) conf = config_match(srcaddr, sa4); if (!conf || !conf->permit) { close(s_src); - exit_failure("translation to %s not permitted for %s", dst4, - prefix_string(&conf->match)); - /*NOTREACHED*/ + if (conf) { + exit_failure("translation to %s not permitted for %s", + dst4, prefix_string(&conf->match)); + /*NOTREACHED*/ + } else { + exit_failure("translation to %s not permitted", dst4); + /*NOTREACHED*/ + } } syslog(LOG_INFO, "the translator is connecting to %s", dst4); |