From 45bda4b5304e92e11573063a453874bc9d16a306 Mon Sep 17 00:00:00 2001 From: shin Date: Thu, 10 Feb 2000 19:42:42 +0000 Subject: Wording fixes Submitted by: charnier --- usr.sbin/faithd/README | 10 +++++----- usr.sbin/faithd/faithd.8 | 2 +- usr.sbin/faithd/faithd.c | 10 +++++----- usr.sbin/faithd/ftp.c | 2 +- usr.sbin/faithd/rsh.c | 6 +++--- 5 files changed, 15 insertions(+), 15 deletions(-) (limited to 'usr.sbin/faithd') diff --git a/usr.sbin/faithd/README b/usr.sbin/faithd/README index f8e4753..47d7a2d 100644 --- a/usr.sbin/faithd/README +++ b/usr.sbin/faithd/README @@ -8,7 +8,7 @@ $FreeBSD$ Introduction ============ -FAITH is a IPv6-to-IPv4 TCP relay. It performs tcp relay just as some of +FAITH is a IPv6-to-IPv4 TCP relay. It performs TCP relay just as some of firewall-oriented gateway does, but between IPv6 and IPv4 with address translation. TCP connections has to be made from IPv6 node to IPv4 node. FAITH will @@ -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:1234:ffff::123.4.5.6 (which is, 3ffe:0501:1234:ffff: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. @@ -42,7 +42,7 @@ Setup ===== The following example assumes: -- You have assigned 3ffe:0501:1234:ffff:: as FAITH adderss prefix. +- You have assigned 3ffe:0501:1234:ffff:: as FAITH address prefix. - You are willing to provide IPv6-to IPv4 TCP relay for telnet. <> @@ -100,7 +100,7 @@ There are two ways to translate IPv4 address to IPv6 address: KAME package. KAME package is obtained from www.kame.net. (5.b) Add an entry into /etc/hosts so that you can resolve hostname into -faked IPv6 addrss. For example, add the following line for www.freebsd.org: +faked IPv6 address. For example, add the following line for www.freebsd.org: 3ffe:0501:1234:ffff::204.216.27.21 www.freebsd.org @@ -125,7 +125,7 @@ want to do the following: By this way, you can restrict IPv4 destination to 123.0.0.0/8. You may also want to reject packets toward 3ffe:0501:1234:ffff::/64 which -is not in 3ffe:0501:1234:ffff::123.0.0.0/104. This will be left as excerside +is not in 3ffe:0501:1234:ffff::123.0.0.0/104. This will be left as exercise for the reader. By doing this, you will be able to provide your IPv4 web server to outside diff --git a/usr.sbin/faithd/faithd.8 b/usr.sbin/faithd/faithd.8 index 2f62ed3..1cca728 100644 --- a/usr.sbin/faithd/faithd.8 +++ b/usr.sbin/faithd/faithd.8 @@ -236,7 +236,7 @@ on error. .%A Jun-ichiro itojun Hagino .%A Kazu Yamamoto .%T "An IPv6-to-IPv4 transport relay translator" -.%R internet draft +.%R Internet draft .%N draft-ietf-ngtrans-tcpudp-relay-00.txt .%O work in progress material .Re diff --git a/usr.sbin/faithd/faithd.c b/usr.sbin/faithd/faithd.c index ee6c8df..6c4a6a4 100644 --- a/usr.sbin/faithd/faithd.c +++ b/usr.sbin/faithd/faithd.c @@ -192,7 +192,7 @@ main(int argc, char *argv[]) default: serverargc = argc - NUMARG; if (serverargc > MAXARGV) - exit_error("too many augments"); + exit_error("too many arguments"); serverpath = malloc(strlen(argv[NUMPRG])); strcpy(serverpath, argv[NUMPRG]); @@ -201,7 +201,7 @@ main(int argc, char *argv[]) strcpy(serverarg[i], argv[i + NUMARG]); } serverarg[i] = NULL; - /* fall throuth */ + /* FALLTHROUGH */ case 1: /* no local service */ service = argv[NUMPRT]; break; @@ -278,10 +278,10 @@ main(int argc, char *argv[]) snprintf(logname, sizeof(logname), "faithd %s", service); snprintf(procname, sizeof(procname), "accepting port %s", service); openlog(logname, LOG_PID | LOG_NOWAIT, LOG_DAEMON); - syslog(LOG_INFO, "Staring faith daemon for %s port", service); + syslog(LOG_INFO, "starting faith daemon for %s port", service); play_service(s_wld); - /*NOTRECHED*/ + /*NOTREACHED*/ exit(1); /*pacify gcc*/ } @@ -625,7 +625,7 @@ sig_child(int sig) void sig_terminate(int sig) { - syslog(LOG_INFO, "Terminating faith daemon"); + syslog(LOG_INFO, "terminating faith daemon"); exit(EXIT_SUCCESS); } diff --git a/usr.sbin/faithd/ftp.c b/usr.sbin/faithd/ftp.c index fcb25e3..b45017a 100644 --- a/usr.sbin/faithd/ftp.c +++ b/usr.sbin/faithd/ftp.c @@ -405,7 +405,7 @@ ftp_copyresult(int src, int dst, enum state state) if (!passivemode && rbuf[0] == '1') { if (ftp_activeconn() < 0) { n = snprintf(rbuf, sizeof(rbuf), - "425 Cannot open data connetion\r\n"); + "425 Cannot open data connection\r\n"); } } write(dst, rbuf, n); diff --git a/usr.sbin/faithd/rsh.c b/usr.sbin/faithd/rsh.c index c6e8357..e66ced1 100644 --- a/usr.sbin/faithd/rsh.c +++ b/usr.sbin/faithd/rsh.c @@ -69,7 +69,7 @@ rsh_relay(int s_src, int s_dst) if (error == -1) exit_failure("select %d: %s", s_src, ERRSTR); else if (error == 0) - exit_failure("connecion timeout"); + exit_failure("connection timeout"); n = read(s_src, rshbuf, sizeof(rshbuf)); if (rshbuf[0] != 0) { @@ -112,7 +112,7 @@ relay(int src, int dst) close(dst); close(s_ctl); close(s_ctl6); - exit_success("terminating rsh/contorol connections"); + exit_success("terminating rsh/control connections"); break; default: write(s_snd, rshbuf, n); @@ -180,7 +180,7 @@ rsh_dual_relay(int s_src, int s_dst) if (error == -1) exit_failure("select 4 sockets: %s", ERRSTR); else if (error == 0) - exit_failure("connecion timeout"); + exit_failure("connection timeout"); if (half == NO && FD_ISSET(s_src, &readfds)) { s_rcv = s_src; -- cgit v1.1