summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--regress/sbin/ipsecctl/Makefile4
-rw-r--r--regress/sbin/pfctl/Makefile6
-rw-r--r--sbin/ipsecctl/parse.y4
-rw-r--r--sbin/isakmpd/monitor.c4
-rw-r--r--sbin/ping6/ping6.c8
-rw-r--r--sys/arch/m68k/fpe/fpu_int.c4
-rw-r--r--usr.sbin/bgpctl/irr_prefix.c4
-rw-r--r--usr.sbin/httpd/src/main/http_core.c4
-rw-r--r--usr.sbin/httpd/src/modules/ssl/ssl_scache_shmcb.c2
-rw-r--r--usr.sbin/pppd/ipcp.c4
-rw-r--r--usr.sbin/relayd/control.c4
11 files changed, 24 insertions, 24 deletions
diff --git a/regress/sbin/ipsecctl/Makefile b/regress/sbin/ipsecctl/Makefile
index 5cc945af13f..16b298b16be 100644
--- a/regress/sbin/ipsecctl/Makefile
+++ b/regress/sbin/ipsecctl/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.57 2009/08/04 15:07:54 jsing Exp $
+# $OpenBSD: Makefile,v 1.58 2010/05/10 02:00:49 krw Exp $
# you can update the *.ok files with: make -i | patch
# TARGETS
-# ipsec: feed ipsecNN.in through ipsecctl and check wether the output matches
+# ipsec: feed ipsecNN.in through ipsecctl and check whether the output matches
# ipsecNN.ok
# tcpmd5: same as above, but for tcpmd5 rules
# sa: same as above, but for SA rules.
diff --git a/regress/sbin/pfctl/Makefile b/regress/sbin/pfctl/Makefile
index cb72f701999..f6d743e0063 100644
--- a/regress/sbin/pfctl/Makefile
+++ b/regress/sbin/pfctl/Makefile
@@ -1,12 +1,12 @@
-# $OpenBSD: Makefile,v 1.209 2010/01/13 00:52:14 mcbride Exp $
+# $OpenBSD: Makefile,v 1.210 2010/05/10 02:00:50 krw Exp $
# TARGETS
-# pf: feed pfNN.in through pfctl and check wether the output matches pfNN.ok
+# pf: feed pfNN.in through pfctl and check whether the output matches pfNN.ok
# selfpf: feed pfctl output through pfctl again and verify it stays the same
# pfail: invalid rulesets pfctl must reject; pfailNN.in and pfailNN.ok
# pfsetup: set up lo1 and perform more tests
# pfr: table tests
-# pfsimple: just check wether pfctl accepts a given ruleset, not checking output
+# pfsimple: just check whether pfctl accepts a given ruleset, not checking output
# pfload: load ruleset into anchor regress and verify pfctl -vvsr
# pfoptimize: as pfload, with -o flag to pfctl
# pfopt: as target pf, but supply extra command line options
diff --git a/sbin/ipsecctl/parse.y b/sbin/ipsecctl/parse.y
index b850f08eea2..405323c0967 100644
--- a/sbin/ipsecctl/parse.y
+++ b/sbin/ipsecctl/parse.y
@@ -1,4 +1,4 @@
-/* $OpenBSD: parse.y,v 1.146 2009/08/04 15:05:50 jsing Exp $ */
+/* $OpenBSD: parse.y,v 1.147 2010/05/10 02:00:50 krw Exp $ */
/*
* Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -1801,7 +1801,7 @@ ifa_exists(const char *ifa_name)
if (iftab == NULL)
ifa_load();
- /* check wether this is a group */
+ /* check whether this is a group */
if ((s = socket(AF_INET, SOCK_DGRAM, 0)) == -1)
err(1, "ifa_exists: socket");
bzero(&ifgr, sizeof(ifgr));
diff --git a/sbin/isakmpd/monitor.c b/sbin/isakmpd/monitor.c
index 8e1e105ebb0..83a372e226e 100644
--- a/sbin/isakmpd/monitor.c
+++ b/sbin/isakmpd/monitor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor.c,v 1.71 2007/08/11 00:20:30 hshoexer Exp $ */
+/* $OpenBSD: monitor.c,v 1.72 2010/05/10 02:00:50 krw Exp $ */
/*
* Copyright (c) 2003 Håkan Olsson. All rights reserved.
@@ -697,7 +697,7 @@ m_priv_local_sanitize_path(char *path, size_t pmax, int flags)
if (realpath(path, new_path) == NULL ||
realpath("/var/run", var_run) == NULL) {
/*
- * We could not decide wether the path is ok or not.
+ * We could not decide whether the path is ok or not.
* Indicate this be returning 2.
*/
if (errno == ENOENT)
diff --git a/sbin/ping6/ping6.c b/sbin/ping6/ping6.c
index 14cb626a8bc..bede8d8a51a 100644
--- a/sbin/ping6/ping6.c
+++ b/sbin/ping6/ping6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ping6.c,v 1.78 2010/02/21 19:00:11 deraadt Exp $ */
+/* $OpenBSD: ping6.c,v 1.79 2010/05/10 02:00:50 krw Exp $ */
/* $KAME: ping6.c,v 1.163 2002/10/25 02:19:06 itojun Exp $ */
/*
@@ -939,7 +939,7 @@ main(int argc, char *argv[])
/*
* receive control messages only. Process the
- * exceptions (currently the only possiblity is
+ * exceptions (currently the only possibility is
* a path MTU notification.)
*/
if ((mtu = get_pathmtu(&m)) > 0) {
@@ -1582,7 +1582,7 @@ pr_ip6opt(void *extbuf)
switch (type) {
/*
* Note that inet6_opt_next automatically skips any padding
- * optins.
+ * options.
*/
case IP6OPT_JUMBO:
offset = 0;
@@ -1780,7 +1780,7 @@ pr_nodeaddr(struct icmp6_nodeinfo *ni, int nilen)
/*
* In icmp-name-lookups 05 and later, TTL of each returned address
- * is contained in the resposne. We try to detect the version
+ * is contained in the response. We try to detect the version
* by the length of the data, but note that the detection algorithm
* is incomplete. We assume the latest draft by default.
*/
diff --git a/sys/arch/m68k/fpe/fpu_int.c b/sys/arch/m68k/fpe/fpu_int.c
index 88a1534ebc0..42fe85c05cf 100644
--- a/sys/arch/m68k/fpe/fpu_int.c
+++ b/sys/arch/m68k/fpe/fpu_int.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: fpu_int.c,v 1.4 2006/06/11 20:43:28 miod Exp $ */
+/* $OpenBSD: fpu_int.c,v 1.5 2010/05/10 02:00:50 krw Exp $ */
/* $NetBSD: fpu_int.c,v 1.6 2003/07/15 02:43:10 lukem Exp $ */
/*
@@ -84,7 +84,7 @@ fpu_int(fe)
if (x->fp_class != FPC_NUM) {
return x;
}
- /* even if we have exponent == -1, we still have possiblity
+ /* even if we have exponent == -1, we still have possibility
that the result >= 1.0 when mantissa ~= 1.0 and rounded up */
if (x->fp_exp < -1) {
x->fp_class = FPC_ZERO;
diff --git a/usr.sbin/bgpctl/irr_prefix.c b/usr.sbin/bgpctl/irr_prefix.c
index 9f7d0aac042..df85a6b945c 100644
--- a/usr.sbin/bgpctl/irr_prefix.c
+++ b/usr.sbin/bgpctl/irr_prefix.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: irr_prefix.c,v 1.17 2009/09/08 16:11:36 sthen Exp $ */
+/* $OpenBSD: irr_prefix.c,v 1.18 2010/05/10 02:00:50 krw Exp $ */
/*
* Copyright (c) 2007 Henning Brauer <henning@openbsd.org>
@@ -213,7 +213,7 @@ prefix_aggregate(struct irr_prefix *a, const struct irr_prefix *b)
return (1);
}
- /* see wether we can fold them in one */
+ /* see whether we can fold them in one */
if (a->len == b->len && a->len > 1) {
if (a->af == AF_INET) {
mask = htonl(prefixlen2mask(a->len - 1));
diff --git a/usr.sbin/httpd/src/main/http_core.c b/usr.sbin/httpd/src/main/http_core.c
index 035bc2fc160..5f416f0ea3a 100644
--- a/usr.sbin/httpd/src/main/http_core.c
+++ b/usr.sbin/httpd/src/main/http_core.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: http_core.c,v 1.26 2010/02/23 08:15:27 pyr Exp $ */
+/* $OpenBSD: http_core.c,v 1.27 2010/05/10 02:00:50 krw Exp $ */
/* ====================================================================
* The Apache Software License, Version 1.1
@@ -1934,7 +1934,7 @@ static const char *set_server_root(cmd_parms *cmd, void *dummy, char *arg)
* On restarts (graceful or not) we are (unless we're in unsecure mode).
* if we would strip off the chroot prefix, nothing (not even "/")
* would last.
- * it's pointless to test wether ServerRoot is a directory if we are
+ * it's pointless to test whether ServerRoot is a directory if we are
* already chrooted into that.
* Of course it's impossible to change ServerRoot without a full restart.
* should we abort with an error if ap_server_root != arg?
diff --git a/usr.sbin/httpd/src/modules/ssl/ssl_scache_shmcb.c b/usr.sbin/httpd/src/modules/ssl/ssl_scache_shmcb.c
index d5b8050451a..e25f30cfe11 100644
--- a/usr.sbin/httpd/src/modules/ssl/ssl_scache_shmcb.c
+++ b/usr.sbin/httpd/src/modules/ssl/ssl_scache_shmcb.c
@@ -1092,7 +1092,7 @@ static BOOL shmcb_insert_encoded_session(
}
}
- /* probably unecessary checks, but I'll leave them until this code
+ /* probably unnecessary checks, but I'll leave them until this code
* is verified. */
if (shmcb_get_safe_uint(cache->pos_count) + encoded_len >
header->cache_data_size) {
diff --git a/usr.sbin/pppd/ipcp.c b/usr.sbin/pppd/ipcp.c
index 34c921bf256..1577557ab77 100644
--- a/usr.sbin/pppd/ipcp.c
+++ b/usr.sbin/pppd/ipcp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ipcp.c,v 1.12 2009/10/27 23:59:53 deraadt Exp $ */
+/* $OpenBSD: ipcp.c,v 1.13 2010/05/10 02:00:50 krw Exp $ */
/*
* ipcp.c - PPP IP Control Protocol.
@@ -861,7 +861,7 @@ ipcp_reqci(f, inp, len, reject_if_disagree)
* If he doesn't know our address, or if we both have our address
* but disagree about it, then NAK it with our idea.
*/
- GETLONG(tl, p); /* Parse desination address (ours) */
+ GETLONG(tl, p); /* Parse destination address (ours) */
ciaddr2 = htonl(tl);
IPCPDEBUG((LOG_INFO, "%s)", ip_ntoa(ciaddr2)));
if (ciaddr2 != wo->ouraddr) {
diff --git a/usr.sbin/relayd/control.c b/usr.sbin/relayd/control.c
index b205b93d3b0..bbcde386601 100644
--- a/usr.sbin/relayd/control.c
+++ b/usr.sbin/relayd/control.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: control.c,v 1.34 2010/01/11 06:40:14 jsg Exp $ */
+/* $OpenBSD: control.c,v 1.35 2010/05/10 02:00:50 krw Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -342,7 +342,7 @@ control_dispatch_imsg(int fd, short event, void *arg)
*
* so in this case, the reply relayctl gets means
* that the reload command has been set,
- * it doesn't say wether the command succeeded or not.
+ * it doesn't say whether the command succeeded or not.
*/
imsg_compose_event(&c->iev, IMSG_CTL_OK,
0, 0, -1, NULL, 0);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 07:24:59 +0000