sync with the latest kame code. insufficient len in malloc() call is

corrected.

1 files changed, 31 insertions, 32 deletions

diff --git a/usr.sbin/faithd/faithd.8 b/usr.sbin/faithd/faithd.8
index 35673944e87..13de51cc659 100644
--- a/usr.sbin/faithd/faithd.8
+++ b/usr.sbin/faithd/faithd.8
@@ -1,4 +1,5 @@
-.\"	$OpenBSD: faithd.8,v 1.5 2000/04/12 21:47:52 aaron Exp $
+.\"	$OpenBSD: faithd.8,v 1.6 2000/05/31 03:09:22 itojun Exp $
+.\"	$KAME: faithd.8,v 1.9 2000/05/31 03:06:07 itojun Exp $
 .\"
 .\" Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
 .\" All rights reserved.
@@ -27,8 +28,6 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.\"	KAME Id: faithd.8,v 1.6 2000/03/12 16:49:34 itojun Exp
-.\"
 .Dd May 17, 1998
 .Dt FAITHD 8
 .Os
@@ -36,15 +35,9 @@
 .Nm faithd
 .Nd FAITH IPv6/v4 translator daemon
 .Sh SYNOPSIS
-.Nm faithd
+.Nm
 .Op Fl dp
-.Oo
-.Ar service
-.Oo
-.Ar serverpath
-.Op Ar serverargs
-.Oc
-.Oc
+.Op Ar service Op Ar serverpath Op Ar serverargs
 .Sh DESCRIPTION
 .Nm
 provides IPv6/v4 TCP relay for the specified
@@ -53,7 +46,9 @@ provides IPv6/v4 TCP relay for the specified
 .Nm
 must be invoked on IPv4/v6 dual stack router.
 The router must be configured to capture all the TCP traffic
-toward reserved IPv6 address prefix, by using
+toward reserved
+.Tn IPv6
+address prefix, by using
 .Xr route 8
 and
 .Xr sysctl 8
@@ -62,20 +57,32 @@ commands.
 will daemonize itself on invocation.
 .Pp
 .Nm
-will listen to TCPv6 port
+will listen to
+.Tn TCPv6
+port
 .Ar service .
-If TCPv6 traffic to port
+If
+.Tn TCPv6
+traffic to port
 .Ar service
 is found,
 .Nm
-will relay the TCPv6 traffic to TCPv4.
-Destination for relayed TCPv4 connection will be determined by the
-last 4 octets of the original IPv6 destination.
+will relay the
+.Tn TCPv6
+traffic to
+.Tn TCPv4 .
+Destination for relayed
+.Tn TCPv4
+connection will be determined by the last 4 octets of the original
+.Tn IPv6
+destination.
 For example, if
 .Li 3ffe:0501:4819:ffff::
 is reserved for
-.Nm faithd ,
-and the TCPv6 destination address is
+.Nm Ns ,
+and the
+.Tn TCPv6
+destination address is
 .Li 3ffe:0501:4819:ffff::0a01:0101 ,
 the traffic will be relayed to IPv4 destination
 .Li 10.1.1.1 .
@@ -107,7 +114,7 @@ or other standard mechanisms.
 By specifying
 .Ar serverpath
 to
-.Nm faithd ,
+.Nm Ns ,
 you can run local daemons on the router.
 .Nm
 will invoke local daemon at
@@ -178,13 +185,10 @@ on client.
 Inactive sessions will be disconnected in 30 minutes,
 to avoid stale sessions from chewing up resources.
 This may be inappropriate for some of the services
-.Po
-should this be configurable?
-.Pc .
-.\"
+.Pq should this be configurable? .
 .Sh EXAMPLES
 Before invoking
-.Nm faithd ,
+.Nm Ns ,
 .Xr faith 4
 interface has to be configured properly.
 .Pp
@@ -218,7 +222,6 @@ Here are some other examples:
 # faithd shell /usr/libexec/rshd rshd
 # faithd sshd
 .Ed
-.\"
 .Sh RETURN VALUES
 .Nm
 exits with
@@ -228,7 +231,6 @@ on success, and
 .Dv EXIT_FAILURE
 .Pq 1
 on error.
-.\"
 .Sh SEE ALSO
 .Xr faith 4 ,
 .Xr route 8 ,
@@ -238,18 +240,15 @@ on error.
 .%A Kazu Yamamoto
 .%T "An IPv6-to-IPv4 transport relay translator"
 .%R internet draft
-.%N draft-ietf-ngtrans-tcpudp-relay-00.txt
+.%N draft-ietf-ngtrans-tcpudp-relay-01.txt
 .%O work in progress material
 .Re
-.\"
 .Sh SECURITY NOTICE
 It is very insecure to use
 .Xr rhosts 5
 and other IP-address based authentication, for connections relayed by
 .Nm
-.Po
-and any other TCP relaying services
-.Pc .
+.Pq and any other TCP relaying services .
 .Pp
 .Nm
 itself does not implement access controls, as