summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbenno <benno@openbsd.org>2020-06-30 21:58:13 +0000
committerbenno <benno@openbsd.org>2020-06-30 21:58:13 +0000
commitfae51641f55737daee84d51e1373f2fdef333bbe (patch)
tree066ce210cb337bdeec39eba79e130d70d8a2c38f
parentWhen we sleep during one of the copyin(9) functions, another process may (diff)
downloadwireguard-openbsd-fae51641f55737daee84d51e1373f2fdef333bbe.tar.xz
wireguard-openbsd-fae51641f55737daee84d51e1373f2fdef333bbe.zip
Fix two places where carp backup state is misspelled in comments.
ok claudio@
-rw-r--r--etc/examples/sasyncd.conf4
-rw-r--r--sys/netinet6/in6.c8
2 files changed, 6 insertions, 6 deletions
diff --git a/etc/examples/sasyncd.conf b/etc/examples/sasyncd.conf
index 4551c3e300e..a1894a1f6d1 100644
--- a/etc/examples/sasyncd.conf
+++ b/etc/examples/sasyncd.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: sasyncd.conf,v 1.1 2014/07/11 21:20:10 deraadt Exp $
+# $OpenBSD: sasyncd.conf,v 1.2 2020/06/30 21:58:13 benno Exp $
# sample sasyncd configuration file
# see sasyncd.conf(5)
@@ -7,7 +7,7 @@
#peer 10.0.0.3
#peer 10.0.0.4
-# Track master/slave state on this carp(4) interface.
+# Track master/backup state on this carp(4) interface.
#interface carp1
# Shared AES key, 16/24/32 bytes.
diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c
index 6189bca7c02..0b32027bbfa 100644
--- a/sys/netinet6/in6.c
+++ b/sys/netinet6/in6.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: in6.c,v 1.237 2020/06/24 22:03:44 cheloha Exp $ */
+/* $OpenBSD: in6.c,v 1.238 2020/06/30 21:58:13 benno Exp $ */
/* $KAME: in6.c,v 1.372 2004/06/14 08:14:21 itojun Exp $ */
/*
@@ -1577,9 +1577,9 @@ in6_ifawithscope(struct ifnet *oifp, struct in6_addr *dst, u_int rdomain)
* We should only use a carp address if no
* other interface has a usable address.
* Otherwise, when communicating from a carp
- * master to a carp slave, the slave won't
- * respond since the carp address is also
- * configured as a local address on the slave.
+ * master to a carp backup, the backup system
+ * won't respond since the carp address is also
+ * configured as a local address on the backup.
* Note that carp interfaces in backup state
* were already skipped above.
*/