From 76bac5ddc6c14586ca6f22f232b7fb282859f19e Mon Sep 17 00:00:00 2001
From: phessler <phessler@openbsd.org>
Date: Sat, 6 Dec 2025 10:41:07 +0000
Subject: [PATCH] sort the "va" keyword to be in alpha order, some programs use
 bsearch

noticed by deraadt@
---
 sbin/pfctl/parse.y | 6 +++---
 sbin/ping/ping.c   | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sbin/pfctl/parse.y b/sbin/pfctl/parse.y
index 1a3601eb512..dcc2ee6fbf0 100644
--- a/sbin/pfctl/parse.y
+++ b/sbin/pfctl/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.721 2025/12/05 17:48:47 phessler Exp $	*/
+/*	$OpenBSD: parse.y,v 1.722 2025/12/06 10:41:07 phessler Exp $	*/
 
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
@@ -6347,12 +6347,12 @@ map_tos(char *s, int *val)
 		{ "cs6",		IPTOS_DSCP_CS6 },
 		{ "cs7",		IPTOS_DSCP_CS7 },
 		{ "ef",			IPTOS_DSCP_EF },
-		{ "va",			IPTOS_DSCP_VA },
 		{ "inetcontrol",	IPTOS_PREC_INTERNETCONTROL },
 		{ "lowdelay",		IPTOS_LOWDELAY },
 		{ "netcontrol",		IPTOS_PREC_NETCONTROL },
 		{ "reliability",	IPTOS_RELIABILITY },
-		{ "throughput",		IPTOS_THROUGHPUT }
+		{ "throughput",		IPTOS_THROUGHPUT },
+		{ "va",			IPTOS_DSCP_VA },
 	};
 	const struct keywords	*p;
 
diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c
index 35314a11b3c..b0e9257a730 100644
--- a/sbin/ping/ping.c
+++ b/sbin/ping/ping.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ping.c,v 1.250 2025/12/05 17:48:47 phessler Exp $	*/
+/*	$OpenBSD: ping.c,v 1.251 2025/12/06 10:41:07 phessler Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -1822,12 +1822,12 @@ map_tos(char *key, int *val)
 		{ "cs6",		IPTOS_DSCP_CS6 },
 		{ "cs7",		IPTOS_DSCP_CS7 },
 		{ "ef",			IPTOS_DSCP_EF },
-		{ "va",			IPTOS_DSCP_VA },
 		{ "inetcontrol",	IPTOS_PREC_INTERNETCONTROL },
 		{ "lowdelay",		IPTOS_LOWDELAY },
 		{ "netcontrol",		IPTOS_PREC_NETCONTROL },
 		{ "reliability",	IPTOS_RELIABILITY },
 		{ "throughput",		IPTOS_THROUGHPUT },
+		{ "va",			IPTOS_DSCP_VA },
 		{ NULL,			-1 },
 	};