Since nearly 20 years the correct spelling of

ICMP6_DST_UNREACH_NOTNEIGHBOR is ICMP6_DST_UNREACH_BEYONDSCOPE (RFC
1885 was obsoleted).
sthen grepped the ports sources to make sure nothing uses it.
OK millert, jca

4 files changed, 6 insertions, 9 deletions

diff --git a/sbin/pfctl/pfctl_parser.c b/sbin/pfctl/pfctl_parser.c
index ff88383aed7..6844c29c9fe 100644
--- a/sbin/pfctl/pfctl_parser.c
+++ b/sbin/pfctl/pfctl_parser.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pfctl_parser.c,v 1.313 2017/07/19 12:58:31 mikeb Exp $ */
+/*	$OpenBSD: pfctl_parser.c,v 1.314 2017/08/03 17:36:06 florian Exp $ */
 
 /*
  * Copyright (c) 2001 Daniel Hartmeier
@@ -173,7 +173,6 @@ static const struct icmpcodeent icmp_code[] = {
 static const struct icmpcodeent icmp6_code[] = {
 	{ "admin-unr", ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_ADMIN },
 	{ "noroute-unr", ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_NOROUTE },
-	{ "notnbr-unr",	ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_NOTNEIGHBOR },
 	{ "beyond-unr", ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_BEYONDSCOPE },
 	{ "addr-unr", ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_ADDR },
 	{ "port-unr", ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_NOPORT },
diff --git a/share/man/man4/icmp6.4 b/share/man/man4/icmp6.4
index 0eab1f40620..d9089ce0822 100644
--- a/share/man/man4/icmp6.4
+++ b/share/man/man4/icmp6.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: icmp6.4,v 1.30 2016/07/16 18:55:55 jca Exp $
+.\"	$OpenBSD: icmp6.4,v 1.31 2017/08/03 17:36:06 florian Exp $
 .\"	$KAME: icmp6.4,v 1.6 2004/12/27 05:30:56 itojun Exp $
 .\"
 .\" Copyright (c) 1986, 1991, 1993
@@ -27,7 +27,7 @@
 .\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
-.Dd $Mdocdate: July 16 2016 $
+.Dd $Mdocdate: August 3 2017 $
 .Dt ICMP6 4
 .Os
 .Sh NAME
@@ -118,7 +118,6 @@ The following codes are defined:
 .It 0 Ta noroute-unr Ta unreach Ta "No route to destination"
 .It 1 Ta admin-unr Ta unreach Ta "Administratively prohibited"
 .It 2 Ta beyond-unr Ta unreach Ta "Beyond scope of source address"
-.It 2 Ta notnbr-unr Ta unreach Ta "Not a neighbor (obsolete)"
 .It 3 Ta addr-unr Ta unreach Ta "Address unreachable"
 .It 4 Ta port-unr Ta unreach Ta "Port unreachable"
 .It 0 Ta transit Ta timex Ta "Time exceeded in transit"
diff --git a/sys/netinet/icmp6.h b/sys/netinet/icmp6.h
index 19de45ababf..1713f6c2125 100644
--- a/sys/netinet/icmp6.h
+++ b/sys/netinet/icmp6.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: icmp6.h,v 1.45 2017/07/12 16:53:58 florian Exp $	*/
+/*	$OpenBSD: icmp6.h,v 1.46 2017/08/03 17:36:06 florian Exp $	*/
 /*	$KAME: icmp6.h,v 1.84 2003/04/23 10:26:51 itojun Exp $	*/
 
 /*
@@ -127,7 +127,6 @@ struct icmp6_hdr {
 
 #define ICMP6_DST_UNREACH_NOROUTE	0	/* no route to destination */
 #define ICMP6_DST_UNREACH_ADMIN	 	1	/* administratively prohibited */
-#define ICMP6_DST_UNREACH_NOTNEIGHBOR	2	/* not a neighbor(obsolete) */
 #define ICMP6_DST_UNREACH_BEYONDSCOPE	2	/* beyond scope of source address */
 #define ICMP6_DST_UNREACH_ADDR		3	/* address unreachable */
 #define ICMP6_DST_UNREACH_NOPORT	4	/* port unreachable */
diff --git a/usr.sbin/traceroute/worker.c b/usr.sbin/traceroute/worker.c
index d212d38b935..92979359c21 100644
--- a/usr.sbin/traceroute/worker.c
+++ b/usr.sbin/traceroute/worker.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: worker.c,v 1.4 2017/05/28 10:04:27 benno Exp $	*/
+/*	$OpenBSD: worker.c,v 1.5 2017/08/03 17:36:06 florian Exp $	*/
 /*	$NetBSD: traceroute.c,v 1.10 1995/05/21 15:50:45 mycroft Exp $	*/
 
 /*
@@ -779,7 +779,7 @@ icmp6_code(int code, int *got_there, int *unreachable)
 		++(*unreachable);
 		printf(" !P");
 		break;
-	case ICMP6_DST_UNREACH_NOTNEIGHBOR:
+	case ICMP6_DST_UNREACH_BEYONDSCOPE:
 		++(*unreachable);
 		printf(" !S");
 		break;