summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2002-02-19 21:11:24 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2002-02-19 21:11:24 +0000
commit0379b38f13e9a6e8e8f6ef6459165fc5673b3856 (patch)
tree88871bea19b5b36bd26d1e792b507ef6dd3d7209
parent23b775fab884acb1570160ada54ec6bbe8a517b2 (diff)
IPsec is written ``IPsec'', not ``IPSec''.
-rw-r--r--sbin/isakmpd/pf_key_v2.c4
-rw-r--r--share/man/man4/ipsec.48
-rw-r--r--share/man/man8/vpn.84
-rw-r--r--sys/netinet/ipsec_output.c4
-rw-r--r--usr.bin/netstat/inet.c8
-rw-r--r--usr.sbin/altq/altqd/altq.conf.56
6 files changed, 17 insertions, 17 deletions
diff --git a/sbin/isakmpd/pf_key_v2.c b/sbin/isakmpd/pf_key_v2.c
index 8cb91a2651c..56a27de5cba 100644
--- a/sbin/isakmpd/pf_key_v2.c
+++ b/sbin/isakmpd/pf_key_v2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pf_key_v2.c,v 1.95 2002/01/25 13:07:23 ho Exp $ */
+/* $OpenBSD: pf_key_v2.c,v 1.96 2002/02/19 21:11:19 miod Exp $ */
/* $EOM: pf_key_v2.c,v 1.79 2000/12/12 00:33:19 niklas Exp $ */
/*
@@ -530,7 +530,7 @@ pf_key_v2_open (void)
struct sadb_msg msg;
struct pf_key_v2_msg *regmsg = 0, *ret = 0;
- /* Open the socket we use to speak to IPSec. */
+ /* Open the socket we use to speak to IPsec. */
pf_key_v2_socket = -1;
fd = socket (PF_KEY, SOCK_RAW, PF_KEY_V2);
if (fd == -1)
diff --git a/share/man/man4/ipsec.4 b/share/man/man4/ipsec.4
index 5ee487befb3..73a79210e75 100644
--- a/share/man/man4/ipsec.4
+++ b/share/man/man4/ipsec.4
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ipsec.4,v 1.48 2001/10/05 14:45:53 mpech Exp $
+.\" $OpenBSD: ipsec.4,v 1.49 2002/02/19 21:11:22 miod Exp $
.\"
.\" Copyright 1997 Niels Provos <provos@physnet.uni-hamburg.de>
.\" All rights reserved.
@@ -297,8 +297,8 @@ interfaces, but special care should be taken because of the interactions
between NAT and the IPsec flow matching, especially on the packet output path.
Inside the TCP/IP stack, packets go through the following stages:
.Bd -literal -offset indent
-UL/R -> [X] -> PF/NAT(enc0) -> IPSec -> PF/NAT(IF) -> IF
-UL/R <-------- PF/NAT(enc0) <- IPSec -> PF/NAT(IF) <- IF
+UL/R -> [X] -> PF/NAT(enc0) -> IPsec -> PF/NAT(IF) -> IF
+UL/R <-------- PF/NAT(enc0) <- IPsec -> PF/NAT(IF) <- IF
.Ed
.Pp
With
@@ -311,7 +311,7 @@ The
Stage on the output path represents the point where the packet
is matched against the IPsec flow database (SPD) to determine if and how
the packet has to be IPsec-processed.
-If, at this point, it is determined that the packet should be IPSec-processed,
+If, at this point, it is determined that the packet should be IPsec-processed,
it is processed by the PF/NAT code.
Unless PF drops the packet, it will then be IPsec-processed, even if the
packet has been modified by NAT.
diff --git a/share/man/man8/vpn.8 b/share/man/man8/vpn.8
index f8cb28cf9cb..239ec24abde 100644
--- a/share/man/man8/vpn.8
+++ b/share/man/man8/vpn.8
@@ -1,4 +1,4 @@
-.\" $OpenBSD: vpn.8,v 1.61 2002/02/12 18:01:02 kjell Exp $
+.\" $OpenBSD: vpn.8,v 1.62 2002/02/19 21:11:22 miod Exp $
.\"
.\" Copyright 1998 Niels Provos <provos@physnet.uni-hamburg.de>
.\" All rights reserved.
@@ -86,7 +86,7 @@ option IPSEC # IPSEC VPN
pseudo-device enc 4 # Encapsulation device used by IPSEC
.Ed
.Pp
-To use IPSec,
+To use IPsec,
.Xr ipsec 4
operations must be enabled using
.Xr sysctl 8 .
diff --git a/sys/netinet/ipsec_output.c b/sys/netinet/ipsec_output.c
index 36102f7deae..c2b7cf728c7 100644
--- a/sys/netinet/ipsec_output.c
+++ b/sys/netinet/ipsec_output.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ipsec_output.c,v 1.20 2001/12/06 22:52:10 angelos Exp $ */
+/* $OpenBSD: ipsec_output.c,v 1.21 2002/02/19 21:11:22 miod Exp $ */
/*
* The author of this code is Angelos D. Keromytis (angelos@cis.upenn.edu)
*
@@ -80,7 +80,7 @@ ipsp_process_packet(struct mbuf *m, struct tdb *tdb, int af, int tunalready)
if ((tdb->tdb_sproto == IPPROTO_ESP && !esp_enable) ||
(tdb->tdb_sproto == IPPROTO_AH && !ah_enable) ||
(tdb->tdb_sproto == IPPROTO_IPCOMP && !ipcomp_enable)) {
- DPRINTF(("ipsp_process_packet(): IPSec outbound packet "
+ DPRINTF(("ipsp_process_packet(): IPsec outbound packet "
"dropped due to policy (check your sysctls)\n"));
m_freem(m);
return EHOSTUNREACH;
diff --git a/usr.bin/netstat/inet.c b/usr.bin/netstat/inet.c
index bd028ecd526..69355c763a4 100644
--- a/usr.bin/netstat/inet.c
+++ b/usr.bin/netstat/inet.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: inet.c,v 1.57 2002/02/19 18:38:02 mpech Exp $ */
+/* $OpenBSD: inet.c,v 1.58 2002/02/19 21:11:23 miod Exp $ */
/* $NetBSD: inet.c,v 1.14 1995/10/03 21:42:37 thorpej Exp $ */
/*
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "from: @(#)inet.c 8.4 (Berkeley) 4/20/94";
#else
-static char *rcsid = "$OpenBSD: inet.c,v 1.57 2002/02/19 18:38:02 mpech Exp $";
+static char *rcsid = "$OpenBSD: inet.c,v 1.58 2002/02/19 21:11:23 miod Exp $";
#endif
#endif /* not lint */
@@ -295,7 +295,7 @@ tcp_stats(off, name)
p(tcps_rcvbadsum, "\t\t%u discarded for bad checksum%s\n");
p(tcps_rcvbadoff, "\t\t%u discarded for bad header offset field%s\n");
p1(tcps_rcvshort, "\t\t%u discarded because packet too short\n");
- p1(tcps_rcvnosec, "\t\t%u discarded for missing IPSec protection\n");
+ p1(tcps_rcvnosec, "\t\t%u discarded for missing IPsec protection\n");
p(tcps_inhwcsum, "\t\t%u packet%s hardware-checksummed\n");
p(tcps_connattempt, "\t%u connection request%s\n");
p(tcps_accepts, "\t%u connection accept%s\n");
@@ -350,7 +350,7 @@ udp_stats(off, name)
p(udps_outhwcsum, "\t%lu output packet%s hardware-checksummed\n");
p1(udps_noport, "\t%lu dropped due to no socket\n");
p(udps_noportbcast, "\t%lu broadcast/multicast datagram%s dropped due to no socket\n");
- p1(udps_nosec, "\t%lu dropped due to missing IPSec protection\n");
+ p1(udps_nosec, "\t%lu dropped due to missing IPsec protection\n");
p1(udps_fullsock, "\t%lu dropped due to full socket buffers\n");
delivered = udpstat.udps_ipackets -
udpstat.udps_hdrops -
diff --git a/usr.sbin/altq/altqd/altq.conf.5 b/usr.sbin/altq/altqd/altq.conf.5
index 6ffc5958e34..b64e162d015 100644
--- a/usr.sbin/altq/altqd/altq.conf.5
+++ b/usr.sbin/altq/altqd/altq.conf.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: altq.conf.5,v 1.5 2001/07/25 10:44:33 kjc Exp $
+.\" $OpenBSD: altq.conf.5,v 1.6 2002/02/19 21:11:23 miod Exp $
.\" $KAME: altq.conf.5,v 1.11 2001/07/25 10:40:15 kjc Exp $
.\"
.\" Copyright (C) 2000
@@ -212,7 +212,7 @@ is a protocol number defined for IP packets (e.g. 6 for TCP).
keyword can be used to specify the type of service field value.
.Cm gpi
keyword can be used to specify the Security Parameter Index value for
-IPSec.
+IPsec.
.Pp
When filter value 0 is used, it is taken as a wildcard.
.Bl -tag -width filter6 -offset indent
@@ -263,7 +263,7 @@ keyword can be used to specify the flowlabel field value.
keyword can be used to specify the traffic class field value.
.Cm gpi
keyword can be used to specify the Security Parameter Index value for
-IPSec.
+IPsec.
.Pp
When filter value 0 is used, it is taken as a wildcard.
.Ss CBQ Commands