From 12ef7bd342fb912f05ec57c75a8a542f434dfe75 Mon Sep 17 00:00:00 2001
From: purplerain <purplerain@secbsd.org>
Date: Wed, 24 Apr 2024 01:40:28 +0000
Subject: [PATCH] sync with OpenBSD -current

---
 bin/csh/func.c                               |  6 +--
 bin/ed/buf.c                                 |  6 +--
 bin/ksh/c_ksh.c                              |  6 +--
 bin/ksh/edit.c                               |  4 +-
 bin/pax/buf_subs.c                           |  4 +-
 distrib/notes/arm64/hardware                 | 13 ++++++-
 lib/libcrypto/ec/ec_lib.c                    | 19 +---------
 sbin/fsck_ext2fs/inode.c                     |  4 +-
 sbin/growfs/growfs.c                         |  6 +--
 sbin/ifconfig/ifconfig.c                     |  4 +-
 sbin/ncheck_ffs/ncheck_ffs.c                 |  4 +-
 sbin/ping/ping.c                             |  4 +-
 sys/dev/ic/ahci.c                            |  4 +-
 sys/dev/ic/ahcireg.h                         | 12 +++---
 sys/dev/usb/xhcireg.h                        |  4 +-
 usr.bin/calendar/ostern.c                    |  4 +-
 usr.bin/dc/dc.c                              |  4 +-
 usr.bin/dig/dighost.c                        |  7 ++--
 usr.bin/dig/lib/dns/rdata.c                  | 31 ++++++++-------
 usr.bin/dig/lib/dns/rdata/generic/tkey_249.c | 18 ++++-----
 usr.bin/dig/lib/dns/tsig.c                   | 22 +++++------
 usr.bin/ftp/fetch.c                          | 10 +++--
 usr.bin/make/expandchildren.c                | 14 +++----
 usr.bin/mg/file.c                            |  6 +--
 usr.bin/rdist/docmd.c                        | 32 ++++++++--------
 usr.bin/snmp/snmpc.c                         |  4 +-
 usr.bin/ssh/sshconnect.c                     |  4 +-
 usr.bin/telnet/telnet.c                      |  4 +-
 usr.bin/tftp/tftpsubs.c                      |  4 +-
 usr.bin/tmux/cmd-queue.c                     | 10 ++---
 usr.bin/tmux/window-copy.c                   |  4 +-
 usr.sbin/amd/amd/amq_subr.c                  |  4 +-
 usr.sbin/amd/amd/nfs_ops.c                   |  4 +-
 usr.sbin/dvmrpd/dvmrpe.c                     |  4 +-
 usr.sbin/dvmrpd/probe.c                      |  4 +-
 usr.sbin/ifstated/ifstated.c                 |  4 +-
 usr.sbin/ldpd/lde.c                          |  4 +-
 usr.sbin/lpr/common_source/displayq.c        |  8 ++--
 usr.sbin/makefs/msdos/msdosfs_fat.c          |  4 +-
 usr.sbin/mopd/common/print.c                 |  4 +-
 usr.sbin/mtree/compare.c                     |  4 +-
 usr.sbin/ntpd/control.c                      |  6 +--
 usr.sbin/pcidump/pcidump.c                   | 12 +++---
 usr.sbin/quot/quot.c                         |  7 ++--
 usr.sbin/rad/frontend.c                      | 10 ++++-
 usr.sbin/rad/parse.y                         | 20 ++++++++--
 usr.sbin/rad/printconf.c                     | 21 +++++++++-
 usr.sbin/rad/rad.conf.5                      |  7 +++-
 usr.sbin/rad/rad.h                           |  3 +-
 usr.sbin/radiusd/radiusd_standard.c          |  4 +-
 usr.sbin/ripd/auth.c                         |  4 +-
 usr.sbin/rpki-client/http.c                  |  5 ++-
 usr.sbin/sasyncd/carp.c                      |  4 +-
 usr.sbin/smtpd/lka_filter.c                  |  4 +-
 usr.sbin/smtpd/mda_variables.c               | 40 ++++++++++----------
 usr.sbin/smtpd/mta.c                         |  4 +-
 usr.sbin/tcpdump/print-ospf.c                |  4 +-
 usr.sbin/tcpdump/print-slow.c                |  6 +--
 usr.sbin/tcpdump/print-snmp.c                |  4 +-
 59 files changed, 264 insertions(+), 223 deletions(-)

diff --git a/bin/csh/func.c b/bin/csh/func.c
index b9a775b8a..8515fb18d 100644
--- a/bin/csh/func.c
+++ b/bin/csh/func.c
@@ -1,4 +1,4 @@
-/*    $OpenBSD: func.c,v 1.41 2023/03/08 04:43:04 guenther Exp $       */
+/*    $OpenBSD: func.c,v 1.42 2024/04/23 13:34:50 jsg Exp $       */
 /*    $NetBSD: func.c,v 1.11 1996/02/09 02:28:29 christos Exp $       */
 
 /*-
@@ -866,8 +866,8 @@ xecho(int sep, Char **v)
 	(void) fflush(cshout);
     if (setintr)
 	sigprocmask(SIG_BLOCK, &sigset, NULL);
-	blkfree(gargv);
-	gargv = NULL;
+    blkfree(gargv);
+    gargv = NULL;
 }
 
 void
diff --git a/bin/ed/buf.c b/bin/ed/buf.c
index 06dc7ebc8..48fa5e7b3 100644
--- a/bin/ed/buf.c
+++ b/bin/ed/buf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: buf.c,v 1.24 2019/06/28 13:34:59 deraadt Exp $	*/
+/*	$OpenBSD: buf.c,v 1.25 2024/04/23 13:34:50 jsg Exp $	*/
 /*	$NetBSD: buf.c,v 1.15 1995/04/23 10:07:28 cgd Exp $	*/
 
 /* buf.c: This file contains the scratch-file buffer routines for the
@@ -158,8 +158,8 @@ get_line_node_addr(line_t *lp)
 	if (n && cp == &buffer_head) {
 		seterrmsg("invalid address");
 		return ERR;
-	 }
-	 return n;
+	}
+	return n;
 }
 
 
diff --git a/bin/ksh/c_ksh.c b/bin/ksh/c_ksh.c
index cd75f77ad..d2933bd93 100644
--- a/bin/ksh/c_ksh.c
+++ b/bin/ksh/c_ksh.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: c_ksh.c,v 1.62 2019/06/28 13:34:59 deraadt Exp $	*/
+/*	$OpenBSD: c_ksh.c,v 1.63 2024/04/23 13:34:50 jsg Exp $	*/
 
 /*
  * built-in Korn commands: c_*
@@ -810,8 +810,8 @@ c_typeset(char **wp)
 						if ((vp->flag&INT_U))
 							shprintf("-U ");
 						shprintf("%s\n", vp->name);
-						    if (vp->flag&ARRAY)
-						break;
+						if (vp->flag&ARRAY)
+							break;
 					} else {
 						if (pflag)
 							shprintf("%s ",
diff --git a/bin/ksh/edit.c b/bin/ksh/edit.c
index a06cbe7b4..3ed69e537 100644
--- a/bin/ksh/edit.c
+++ b/bin/ksh/edit.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: edit.c,v 1.70 2023/06/21 22:22:08 millert Exp $	*/
+/*	$OpenBSD: edit.c,v 1.71 2024/04/23 13:34:50 jsg Exp $	*/
 
 /*
  * Command line editing - common code
@@ -451,7 +451,7 @@ x_file_glob(int flags, const char *str, int slen, char ***wordsp)
 		 * which evaluated to an empty string (e.g.,
 		 * "$FOO" when there is no FOO, etc).
 		 */
-		 if ((lstat(words[0], &statb) == -1) ||
+		if ((lstat(words[0], &statb) == -1) ||
 		    words[0][0] == '\0') {
 			x_free_words(nwords, words);
 			words = NULL;
diff --git a/bin/pax/buf_subs.c b/bin/pax/buf_subs.c
index d3c41a4d7..6c1b5582e 100644
--- a/bin/pax/buf_subs.c
+++ b/bin/pax/buf_subs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: buf_subs.c,v 1.32 2023/11/26 16:04:17 espie Exp $	*/
+/*	$OpenBSD: buf_subs.c,v 1.33 2024/04/23 13:34:50 jsg Exp $	*/
 /*	$NetBSD: buf_subs.c,v 1.5 1995/03/21 09:07:08 cgd Exp $	*/
 
 /*-
@@ -765,7 +765,7 @@ cp_file(ARCHD *arcn, int fd1, int fd2)
 	 * check for holes in the source file. If none, we will use regular
 	 * write instead of file write.
 	 */
-	 if (((off_t)(arcn->sb.st_blocks * BLKMULT)) >= arcn->sb.st_size)
+	if (((off_t)(arcn->sb.st_blocks * BLKMULT)) >= arcn->sb.st_size)
 		++no_hole;
 
 	/*
diff --git a/distrib/notes/arm64/hardware b/distrib/notes/arm64/hardware
index 48e11b6bc..03fca42d8 100644
--- a/distrib/notes/arm64/hardware
+++ b/distrib/notes/arm64/hardware
@@ -1,4 +1,4 @@
-dnl	$OpenBSD: hardware,v 1.22 2023/10/25 15:51:45 deraadt Exp $
+dnl	$OpenBSD: hardware,v 1.23 2024/04/23 10:17:20 fcambus Exp $
 The following machines are targeted by SecBSD/MACHINE:
 
 	Allwinner A64/H5/H6
@@ -32,11 +32,14 @@ The following machines are targeted by SecBSD/MACHINE:
 		Apple MacBook Pro (14-inch, M1 Pro/Max, 2021)
 		Apple MacBook Pro (16-inch, M1 Pro/Max, 2021)
 		Apple Studio (M1 Max/Ultra, 2022)
+		Apple Mac mini (M2, 2023)
 		Apple MacBook Air (13-inch, M2, 2022)
 		Apple MacBook Pro (13-inch, M2, 2022)
 		Apple MacBook Air (15-inch, M2, 2023)
+		Apple Mac mini (M2 Pro, 2023)
 		Apple MacBook Pro (14-inch, M2 Pro/Max, 2023)
 		Apple MacBook Pro (16-inch, M2 Pro/Max, 2023)
+		Apple Studio (M2 Max/Ultra, 2023)
 	Broadcom BCM2837/BCM2711
 		Raspberry Pi 3
 		Raspberry Pi 3 Model B+
@@ -49,6 +52,10 @@ The following machines are targeted by SecBSD/MACHINE:
 		GL.iNet Brume
 	Marvell ARMADA 7K/8K
 		SolidRun/Marvell MACCHIATObin
+	NXP i.MX 8M Quad/Mini/Plus
+		MNT Reform
+		SolidRun CuBox-M
+		SolidRun HummingBoard
 	Qualcomm Snapdragon 7cx (SC7180/SC7180P)
 		Acer Aspire One
 	Qualcomm Snapdragon 8cx Gen 3 (SC8280XP)
@@ -68,5 +75,9 @@ The following machines are targeted by SecBSD/MACHINE:
 		ROC-RK3566-PC
 		NanoPi R5S
 		Radxa ROCK 3A
+	Rockchip RK3588
+		Radxa ROCK 5B
+		NanoPi R6C
+		NanoPi R6S
 	Socionext SC2A11
 		Socionext SynQuacer-E Developerbox
diff --git a/lib/libcrypto/ec/ec_lib.c b/lib/libcrypto/ec/ec_lib.c
index dff412458..85567a76c 100644
--- a/lib/libcrypto/ec/ec_lib.c
+++ b/lib/libcrypto/ec/ec_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ec_lib.c,v 1.66 2024/04/10 15:01:31 beck Exp $ */
+/* $OpenBSD: ec_lib.c,v 1.67 2024/04/23 10:52:08 tb Exp $ */
 /*
  * Originally written by Bodo Moeller for the OpenSSL project.
  */
@@ -112,7 +112,6 @@ EC_GROUP_new(const EC_METHOD *meth)
 }
 LCRYPTO_ALIAS(EC_GROUP_new);
 
-
 void
 EC_GROUP_free(EC_GROUP *group)
 {
@@ -188,12 +187,10 @@ EC_GROUP_copy(EC_GROUP *dest, const EC_GROUP *src)
 		dest->seed_len = 0;
 	}
 
-
 	return dest->meth->group_copy(dest, src);
 }
 LCRYPTO_ALIAS(EC_GROUP_copy);
 
-
 EC_GROUP *
 EC_GROUP_dup(const EC_GROUP *a)
 {
@@ -208,7 +205,6 @@ EC_GROUP_dup(const EC_GROUP *a)
 }
 LCRYPTO_ALIAS(EC_GROUP_dup);
 
-
 const EC_METHOD *
 EC_GROUP_method_of(const EC_GROUP *group)
 {
@@ -216,7 +212,6 @@ EC_GROUP_method_of(const EC_GROUP *group)
 }
 LCRYPTO_ALIAS(EC_GROUP_method_of);
 
-
 int
 EC_METHOD_get_field_type(const EC_METHOD *meth)
 {
@@ -358,7 +353,6 @@ EC_GROUP_set_generator(EC_GROUP *group, const EC_POINT *generator,
 }
 LCRYPTO_ALIAS(EC_GROUP_set_generator);
 
-
 const EC_POINT *
 EC_GROUP_get0_generator(const EC_GROUP *group)
 {
@@ -399,7 +393,6 @@ EC_GROUP_get_cofactor(const EC_GROUP *group, BIGNUM *cofactor, BN_CTX *ctx)
 }
 LCRYPTO_ALIAS(EC_GROUP_get_cofactor);
 
-
 void
 EC_GROUP_set_curve_name(EC_GROUP *group, int nid)
 {
@@ -407,7 +400,6 @@ EC_GROUP_set_curve_name(EC_GROUP *group, int nid)
 }
 LCRYPTO_ALIAS(EC_GROUP_set_curve_name);
 
-
 int
 EC_GROUP_get_curve_name(const EC_GROUP *group)
 {
@@ -415,7 +407,6 @@ EC_GROUP_get_curve_name(const EC_GROUP *group)
 }
 LCRYPTO_ALIAS(EC_GROUP_get_curve_name);
 
-
 void
 EC_GROUP_set_asn1_flag(EC_GROUP *group, int flag)
 {
@@ -423,7 +414,6 @@ EC_GROUP_set_asn1_flag(EC_GROUP *group, int flag)
 }
 LCRYPTO_ALIAS(EC_GROUP_set_asn1_flag);
 
-
 int
 EC_GROUP_get_asn1_flag(const EC_GROUP *group)
 {
@@ -431,7 +421,6 @@ EC_GROUP_get_asn1_flag(const EC_GROUP *group)
 }
 LCRYPTO_ALIAS(EC_GROUP_get_asn1_flag);
 
-
 void
 EC_GROUP_set_point_conversion_form(EC_GROUP *group,
     point_conversion_form_t form)
@@ -440,7 +429,6 @@ EC_GROUP_set_point_conversion_form(EC_GROUP *group,
 }
 LCRYPTO_ALIAS(EC_GROUP_set_point_conversion_form);
 
-
 point_conversion_form_t
 EC_GROUP_get_point_conversion_form(const EC_GROUP *group)
 {
@@ -448,7 +436,6 @@ EC_GROUP_get_point_conversion_form(const EC_GROUP *group)
 }
 LCRYPTO_ALIAS(EC_GROUP_get_point_conversion_form);
 
-
 size_t
 EC_GROUP_set_seed(EC_GROUP *group, const unsigned char *p, size_t len)
 {
@@ -469,7 +456,6 @@ EC_GROUP_set_seed(EC_GROUP *group, const unsigned char *p, size_t len)
 }
 LCRYPTO_ALIAS(EC_GROUP_set_seed);
 
-
 unsigned char *
 EC_GROUP_get0_seed(const EC_GROUP *group)
 {
@@ -477,7 +463,6 @@ EC_GROUP_get0_seed(const EC_GROUP *group)
 }
 LCRYPTO_ALIAS(EC_GROUP_get0_seed);
 
-
 size_t
 EC_GROUP_get_seed_len(const EC_GROUP *group)
 {
@@ -564,7 +549,6 @@ EC_GROUP_get_degree(const EC_GROUP *group)
 }
 LCRYPTO_ALIAS(EC_GROUP_get_degree);
 
-
 int
 EC_GROUP_check_discriminant(const EC_GROUP *group, BN_CTX *ctx_in)
 {
@@ -590,7 +574,6 @@ EC_GROUP_check_discriminant(const EC_GROUP *group, BN_CTX *ctx_in)
 }
 LCRYPTO_ALIAS(EC_GROUP_check_discriminant);
 
-
 int
 EC_GROUP_cmp(const EC_GROUP *a, const EC_GROUP *b, BN_CTX *ctx)
 {
diff --git a/sbin/fsck_ext2fs/inode.c b/sbin/fsck_ext2fs/inode.c
index bfe3e5f67..a1861b086 100644
--- a/sbin/fsck_ext2fs/inode.c
+++ b/sbin/fsck_ext2fs/inode.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: inode.c,v 1.29 2019/07/01 07:13:44 kevlo Exp $	*/
+/*	$OpenBSD: inode.c,v 1.30 2024/04/23 13:34:50 jsg Exp $	*/
 /*	$NetBSD: inode.c,v 1.8 2000/01/28 16:01:46 bouyer Exp $	*/
 
 /*
@@ -92,7 +92,7 @@ inosize(struct ext2fs_dinode *dp)
 		size |= (u_int64_t)letoh32(dp->e2di_size_hi) << 32;
 	if (size >= 0x80000000U)
 		 (void)setlarge();
-	 return size;
+	return size;
 }
 
 void
diff --git a/sbin/growfs/growfs.c b/sbin/growfs/growfs.c
index 1f71d27ae..17adf7dc2 100644
--- a/sbin/growfs/growfs.c
+++ b/sbin/growfs/growfs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: growfs.c,v 1.56 2024/02/03 18:51:57 beck Exp $	*/
+/*	$OpenBSD: growfs.c,v 1.57 2024/04/23 13:34:50 jsg Exp $	*/
 /*
  * Copyright (c) 2000 Christoph Herrmann, Thomas-Henning von Kamptz
  * Copyright (c) 1980, 1989, 1993 The Regents of the University of California.
@@ -984,7 +984,7 @@ updcsloc(time_t utime, int fsi, int fso, unsigned int Nflag)
 			    (d % sblock.fs_fpg) / sblock.fs_frag);
 			acg.cg_cs.cs_nbfree++;
 			sblock.fs_cstotal.cs_nbfree++;
-			 if (sblock.fs_contigsumsize > 0) {
+			if (sblock.fs_contigsumsize > 0) {
 				setbit(cg_clustersfree(&acg),
 				    (d % sblock.fs_fpg) / sblock.fs_frag);
 				/*
@@ -1896,7 +1896,7 @@ main(int argc, char **argv)
 		sblock.fs_ncyl = sblock.fs_size * NSPF(&sblock) / sblock.fs_spc;
 		if (sblock.fs_size * NSPF(&sblock) >
 		    sblock.fs_ncyl * sblock.fs_spc)
-		sblock.fs_ncyl++;
+			sblock.fs_ncyl++;
 	}
 	sblock.fs_ncg = howmany(sblock.fs_size, sblock.fs_fpg);
 	if ((ino_t)sblock.fs_ncg * sblock.fs_ipg > UINT_MAX)
diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c
index 8310907e9..eb5a9f2ea 100644
--- a/sbin/ifconfig/ifconfig.c
+++ b/sbin/ifconfig/ifconfig.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ifconfig.c,v 1.470 2023/11/23 03:38:34 dlg Exp $	*/
+/*	$OpenBSD: ifconfig.c,v 1.471 2024/04/23 13:34:50 jsg Exp $	*/
 /*	$NetBSD: ifconfig.c,v 1.40 1997/10/01 02:19:43 enami Exp $	*/
 
 /*
@@ -6313,7 +6313,7 @@ umb_pinop(int op, int is_puk, const char *pin, const char *newpin)
 	if (newpin) {
 		if ((mp.newpinlen = char_to_utf16(newpin, (uint16_t *)mp.newpin,
 		    sizeof (mp.newpin))) == -1)
-		errx(1, "new PIN too long");
+			errx(1, "new PIN too long");
 	}
 
 	if (ioctl(sock, SIOCSUMBPARAM, (caddr_t)&ifr) == -1)
diff --git a/sbin/ncheck_ffs/ncheck_ffs.c b/sbin/ncheck_ffs/ncheck_ffs.c
index 793fb1827..285716abf 100644
--- a/sbin/ncheck_ffs/ncheck_ffs.c
+++ b/sbin/ncheck_ffs/ncheck_ffs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ncheck_ffs.c,v 1.55 2019/07/03 03:24:02 deraadt Exp $	*/
+/*	$OpenBSD: ncheck_ffs.c,v 1.56 2024/04/23 13:34:50 jsg Exp $	*/
 
 /*-
  * Copyright (c) 1995, 1996 SigmaSoft, Th. Lockert <tholo@sigmasoft.com>
@@ -462,7 +462,7 @@ searchdir(ufsino_t ino, daddr_t blkno, long size, off_t filesize,
 			if (dp->d_name[0] == '.') {
 				if (dp->d_name[1] == '\0' ||
 				    (dp->d_name[1] == '.' && dp->d_name[2] == '\0'))
-				continue;
+					continue;
 			}
 			if (asprintf(&npath, "%s/%s", path, dp->d_name) == -1)
 				errx(1, "malloc");
diff --git a/sbin/ping/ping.c b/sbin/ping/ping.c
index a3b3d650e..dd09c272e 100644
--- a/sbin/ping/ping.c
+++ b/sbin/ping/ping.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ping.c,v 1.248 2022/12/01 07:34:06 florian Exp $	*/
+/*	$OpenBSD: ping.c,v 1.249 2024/04/23 13:34:50 jsg Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -378,7 +378,7 @@ main(int argc, char *argv[])
 		case 'p':		/* fill buffer with user pattern */
 			options |= F_PINGFILLED;
 			fill((char *)datap, optarg);
-				break;
+			break;
 		case 'q':
 			options |= F_QUIET;
 			break;
diff --git a/sys/dev/ic/ahci.c b/sys/dev/ic/ahci.c
index 4a679bc5e..225b57eac 100644
--- a/sys/dev/ic/ahci.c
+++ b/sys/dev/ic/ahci.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ahci.c,v 1.39 2023/02/03 18:31:16 miod Exp $ */
+/*	$OpenBSD: ahci.c,v 1.40 2024/04/23 13:09:21 jsg Exp $ */
 
 /*
  * Copyright (c) 2006 David Gwynne <dlg@openbsd.org>
@@ -267,7 +267,7 @@ noccc:
 	 */
 	sc->sc_ncmds = max(2, sc->sc_ncmds);
 	for (i = 0; i < AHCI_MAX_PORTS; i++) {
-		if (!ISSET(pi, 1 << i)) {
+		if (!ISSET(pi, 1U << i)) {
 			/* dont allocate stuff if the port isnt implemented */
 			continue;
 		}
diff --git a/sys/dev/ic/ahcireg.h b/sys/dev/ic/ahcireg.h
index 4510118e8..fc3a9ed4c 100644
--- a/sys/dev/ic/ahcireg.h
+++ b/sys/dev/ic/ahcireg.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ahcireg.h,v 1.5 2015/02/11 07:13:44 jmatthew Exp $ */
+/*	$OpenBSD: ahcireg.h,v 1.6 2024/04/23 13:09:21 jsg Exp $ */
 
 /*
  * Copyright (c) 2006 David Gwynne <dlg@openbsd.org>
@@ -42,7 +42,7 @@
 #define  AHCI_REG_CAP_SMPS		(1<<28) /* Mech Presence Switch */
 #define  AHCI_REG_CAP_SSNTF		(1<<29) /* SNotification Register */
 #define  AHCI_REG_CAP_SNCQ		(1<<30) /* Native Cmd Queuing */
-#define  AHCI_REG_CAP_S64A		(1<<31) /* 64bit Addressing */
+#define  AHCI_REG_CAP_S64A		(1U<<31) /* 64bit Addressing */
 #define  AHCI_FMT_CAP		"\020" "\040S64A" "\037NCQ" "\036SSNTF" \
 				    "\035SMPS" "\034SSS" "\033SALP" "\032SAL" \
 				    "\031SCLO" "\024SNZO" "\023SAM" "\022SPM" \
@@ -52,7 +52,7 @@
 #define  AHCI_REG_GHC_HR		(1<<0) /* HBA Reset */
 #define  AHCI_REG_GHC_IE		(1<<1) /* Interrupt Enable */
 #define  AHCI_REG_GHC_MRSM		(1<<2) /* MSI Revert to Single Msg */
-#define  AHCI_REG_GHC_AE		(1<<31) /* AHCI Enable */
+#define  AHCI_REG_GHC_AE		(1U<<31) /* AHCI Enable */
 #define AHCI_FMT_GHC		"\020" "\040AE" "\003MRSM" "\002IE" "\001HR"
 #define AHCI_REG_IS		0x008 /* Interrupt Status */
 #define AHCI_REG_PI		0x00c /* Ports Implemented */
@@ -103,7 +103,7 @@
 #define  AHCI_PREG_IS_HBDS		(1<<28) /* Host Bus Data Error */
 #define  AHCI_PREG_IS_HBFS		(1<<29) /* Host Bus Fatal Error */
 #define  AHCI_PREG_IS_TFES		(1<<30) /* Task File Error */
-#define  AHCI_PREG_IS_CPDS		(1<<31) /* Cold Presence Detect */
+#define  AHCI_PREG_IS_CPDS		(1U<<31) /* Cold Presence Detect */
 #define AHCI_PFMT_IS		"\20" "\040CPDS" "\037TFES" "\036HBFS" \
 				    "\035HBDS" "\034IFS" "\033INFS" "\031OFS" \
 				    "\030IPMS" "\027PRCS" "\010DMPS" "\006DPS" \
@@ -126,7 +126,7 @@
 #define  AHCI_PREG_IE_HBDE		(1<<28) /* Host Bus Data Error */
 #define  AHCI_PREG_IE_HBFE		(1<<29) /* Host Bus Fatal Error */
 #define  AHCI_PREG_IE_TFEE		(1<<30) /* Task File Error */
-#define  AHCI_PREG_IE_CPDE		(1<<31) /* Cold Presence Detect */
+#define  AHCI_PREG_IE_CPDE		(1U<<31) /* Cold Presence Detect */
 #define AHCI_PFMT_IE		"\20" "\040CPDE" "\037TFEE" "\036HBFE" \
 				    "\035HBDE" "\034IFE" "\033INFE" "\031OFE" \
 				    "\030IPME" "\027PRCE" "\010DMPE" "\007PCE" \
@@ -275,7 +275,7 @@ struct ahci_prdt {
 	u_int64_t		dba;
 	u_int32_t		reserved;
 	u_int32_t		flags;
-#define AHCI_PRDT_FLAG_INTR		(1<<31) /* interrupt on completion */
+#define AHCI_PRDT_FLAG_INTR		(1U<<31) /* interrupt on completion */
 } __packed __aligned(8);
 
 /* this makes ahci_cmd_table 512 bytes, supporting 128-byte alignment */
diff --git a/sys/dev/usb/xhcireg.h b/sys/dev/usb/xhcireg.h
index 41535c367..854684954 100644
--- a/sys/dev/usb/xhcireg.h
+++ b/sys/dev/usb/xhcireg.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: xhcireg.h,v 1.18 2022/01/09 05:43:02 jsg Exp $ */
+/* $OpenBSD: xhcireg.h,v 1.19 2024/04/23 04:12:53 jsg Exp $ */
 
 /*-
  * Copyright (c) 2014 Martin Pieuchot. All rights reserved.
@@ -335,7 +335,7 @@ struct xhci_inctx {
 
 struct xhci_trb {
 	uint64_t trb_paddr;
-#define XHCI_TRB_PORTID(x)	(((x) & (0xff << 24)) >> 24)	/* Port ID */
+#define XHCI_TRB_PORTID(x)	(((x) >> 24) & 0xff)	/* Port ID */
 #define XHCI_TRB_MAXSIZE	(64 * 1024)
 
 	uint32_t trb_status;
diff --git a/usr.bin/calendar/ostern.c b/usr.bin/calendar/ostern.c
index 536e7b8fb..5eefb9c43 100644
--- a/usr.bin/calendar/ostern.c
+++ b/usr.bin/calendar/ostern.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ostern.c,v 1.9 2019/01/17 06:15:44 tedu Exp $	*/
+/*	$OpenBSD: ostern.c,v 1.10 2024/04/23 13:34:50 jsg Exp $	*/
 
 /*
  * Copyright (c) 1996 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
@@ -62,7 +62,7 @@ easter(int year)	/* 0 ... abcd, NOT since 1900 */
 		e_q++;
 
 	if (e_n == 4)
-	e_q += 31;
+		e_q += 31;
 
 #if DEBUG
 	printf("%d %d %d %d %d %d %d %d %d %d %d %d %d %d %d\n",
diff --git a/usr.bin/dc/dc.c b/usr.bin/dc/dc.c
index a8b598c24..204fc356e 100644
--- a/usr.bin/dc/dc.c
+++ b/usr.bin/dc/dc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dc.c,v 1.20 2017/12/06 13:48:05 otto Exp $	*/
+/*	$OpenBSD: dc.c,v 1.21 2024/04/23 13:34:50 jsg Exp $	*/
 
 /*
  * Copyright (c) 2003, Otto Moerbeek <otto@drijf.net>
@@ -110,7 +110,7 @@ dc_main(int argc, char *argv[])
 		 * BSD and Solaris dc(1) continue with stdin after processing
 		 * the file given as the argument. We follow GNU dc(1).
 		 */
-		 return (0);
+		return (0);
 	}
 
 	src_setstream(&src, stdin);
diff --git a/usr.bin/dig/dighost.c b/usr.bin/dig/dighost.c
index 2d2a52c86..c62ee0857 100644
--- a/usr.bin/dig/dighost.c
+++ b/usr.bin/dig/dighost.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dighost.c,v 1.37 2020/12/21 11:41:08 florian Exp $ */
+/* $Id: dighost.c,v 1.38 2024/04/23 13:34:50 jsg Exp $ */
 
 /*! \file
  *  \note
@@ -3643,15 +3643,14 @@ recv_done(isc_task_t *task, isc_event_t *event) {
 	} else {
 
 		if (msg->rcode == dns_rcode_noerror || l->origin == NULL) {
-
-				dighost_received(b->used, &sevent->address, query);
+			dighost_received(b->used, &sevent->address, query);
 		}
 
 		if (!query->lookup->ns_search_only)
 			query->lookup->pending = 0;
 		if (!query->lookup->ns_search_only ||
 		    query->lookup->trace_root || docancel) {
-				dns_message_destroy(&msg);
+			dns_message_destroy(&msg);
 
 			cancel_lookup(l);
 		}
diff --git a/usr.bin/dig/lib/dns/rdata.c b/usr.bin/dig/lib/dns/rdata.c
index acd7caa50..395f3cf12 100644
--- a/usr.bin/dig/lib/dns/rdata.c
+++ b/usr.bin/dig/lib/dns/rdata.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: rdata.c,v 1.35 2022/07/03 12:07:52 florian Exp $ */
+/* $Id: rdata.c,v 1.36 2024/04/23 13:34:50 jsg Exp $ */
 
 /*! \file */
 
@@ -1430,25 +1430,24 @@ byte_btoa(int c, isc_buffer_t *target, struct state *state) {
 			tr.base[0] = 'z';
 			isc_buffer_add(target, 1);
 		} else {
-		    register int tmp = 0;
-		    register int32_t tmpword = word;
+			register int tmp = 0;
+			register int32_t tmpword = word;
 
-		    if (tmpword < 0) {
-			   /*
-			    * Because some don't support u_long.
-			    */
-			tmp = 32;
-			tmpword -= (int32_t)(85 * 85 * 85 * 85 * 32);
-		    }
-		    if (tmpword < 0) {
-			tmp = 64;
-			tmpword -= (int32_t)(85 * 85 * 85 * 85 * 32);
-		    }
+			if (tmpword < 0) {
+				/*
+				 * Because some don't support u_long.
+				 */
+				tmp = 32;
+				tmpword -= (int32_t)(85 * 85 * 85 * 85 * 32);
+			}
+			if (tmpword < 0) {
+				tmp = 64;
+				tmpword -= (int32_t)(85 * 85 * 85 * 85 * 32);
+			}
 			if (tr.length < 5)
 				return (ISC_R_NOSPACE);
 			tr.base[0] = atob_digits[(tmpword /
-					      (int32_t)(85 * 85 * 85 * 85))
-						+ tmp];
+			    (int32_t)(85 * 85 * 85 * 85)) + tmp];
 			tmpword %= (int32_t)(85 * 85 * 85 * 85);
 			tr.base[1] = atob_digits[tmpword / (85 * 85 * 85)];
 			tmpword %= (85 * 85 * 85);
diff --git a/usr.bin/dig/lib/dns/rdata/generic/tkey_249.c b/usr.bin/dig/lib/dns/rdata/generic/tkey_249.c
index 97fab1f5f..b8fb9e8dd 100644
--- a/usr.bin/dig/lib/dns/rdata/generic/tkey_249.c
+++ b/usr.bin/dig/lib/dns/rdata/generic/tkey_249.c
@@ -14,7 +14,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: tkey_249.c,v 1.13 2020/09/14 08:40:43 florian Exp $ */
+/* $Id: tkey_249.c,v 1.14 2024/04/23 13:34:50 jsg Exp $ */
 
 /*
  * Reviewed: Thu Mar 16 17:35:30 PST 2000 by halley.
@@ -127,18 +127,18 @@ totext_tkey(ARGS_TOTEXT) {
 	 */
 	REQUIRE(n <= sr.length);
 	if (n != 0U) {
-	    dr = sr;
-	    dr.length = n;
-	    if ((tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0)
-		    RETERR(isc_str_tobuffer(" (", target));
-	    RETERR(isc_str_tobuffer(tctx->linebreak, target));
+		dr = sr;
+		dr.length = n;
+		if ((tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0)
+			RETERR(isc_str_tobuffer(" (", target));
+		RETERR(isc_str_tobuffer(tctx->linebreak, target));
 		if (tctx->width == 0)   /* No splitting */
 			RETERR(isc_base64_totext(&dr, 60, "", target));
 		else
 			RETERR(isc_base64_totext(&dr, tctx->width - 2,
-						 tctx->linebreak, target));
-	    if ((tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0)
-		    RETERR(isc_str_tobuffer(" )", target));
+			    tctx->linebreak, target));
+		if ((tctx->flags & DNS_STYLEFLAG_MULTILINE) != 0)
+			RETERR(isc_str_tobuffer(" )", target));
 	}
 	return (ISC_R_SUCCESS);
 }
diff --git a/usr.bin/dig/lib/dns/tsig.c b/usr.bin/dig/lib/dns/tsig.c
index 795944c06..57658a91b 100644
--- a/usr.bin/dig/lib/dns/tsig.c
+++ b/usr.bin/dig/lib/dns/tsig.c
@@ -15,7 +15,7 @@
  */
 
 /*
- * $Id: tsig.c,v 1.14 2020/09/14 08:40:43 florian Exp $
+ * $Id: tsig.c,v 1.15 2024/04/23 13:34:50 jsg Exp $
  */
 /*! \file */
 
@@ -295,8 +295,8 @@ dns_tsigkey_create(dns_name_t *name, dns_name_t *algorithm,
 						    DNS_KEYOWNER_ENTITY,
 						    DNS_KEYPROTO_DNSSEC,
 						    &b, &dstkey);
-				if (result != ISC_R_SUCCESS)
-					return (result);
+			if (result != ISC_R_SUCCESS)
+				return (result);
 		}
 	} else if (dns_name_equal(algorithm, DNS_TSIG_HMACSHA224_NAME)) {
 		if (secret != NULL) {
@@ -308,8 +308,8 @@ dns_tsigkey_create(dns_name_t *name, dns_name_t *algorithm,
 						    DNS_KEYOWNER_ENTITY,
 						    DNS_KEYPROTO_DNSSEC,
 						    &b, &dstkey);
-				if (result != ISC_R_SUCCESS)
-					return (result);
+			if (result != ISC_R_SUCCESS)
+				return (result);
 		}
 	} else if (dns_name_equal(algorithm, DNS_TSIG_HMACSHA256_NAME)) {
 		if (secret != NULL) {
@@ -321,8 +321,8 @@ dns_tsigkey_create(dns_name_t *name, dns_name_t *algorithm,
 						    DNS_KEYOWNER_ENTITY,
 						    DNS_KEYPROTO_DNSSEC,
 						    &b, &dstkey);
-				if (result != ISC_R_SUCCESS)
-					return (result);
+			if (result != ISC_R_SUCCESS)
+				return (result);
 		}
 	} else if (dns_name_equal(algorithm, DNS_TSIG_HMACSHA384_NAME)) {
 		if (secret != NULL) {
@@ -334,8 +334,8 @@ dns_tsigkey_create(dns_name_t *name, dns_name_t *algorithm,
 						    DNS_KEYOWNER_ENTITY,
 						    DNS_KEYPROTO_DNSSEC,
 						    &b, &dstkey);
-				if (result != ISC_R_SUCCESS)
-					return (result);
+			if (result != ISC_R_SUCCESS)
+				return (result);
 		}
 	} else if (dns_name_equal(algorithm, DNS_TSIG_HMACSHA512_NAME)) {
 		if (secret != NULL) {
@@ -347,8 +347,8 @@ dns_tsigkey_create(dns_name_t *name, dns_name_t *algorithm,
 						    DNS_KEYOWNER_ENTITY,
 						    DNS_KEYPROTO_DNSSEC,
 						    &b, &dstkey);
-				if (result != ISC_R_SUCCESS)
-					return (result);
+			if (result != ISC_R_SUCCESS)
+				return (result);
 		}
 	} else if (length > 0)
 		return (DNS_R_BADALG);
diff --git a/usr.bin/ftp/fetch.c b/usr.bin/ftp/fetch.c
index 55b6a9fea..799cd7124 100644
--- a/usr.bin/ftp/fetch.c
+++ b/usr.bin/ftp/fetch.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fetch.c,v 1.217 2024/04/17 09:51:18 tb Exp $	*/
+/*	$OpenBSD: fetch.c,v 1.218 2024/04/23 08:50:38 sthen Exp $	*/
 /*	$NetBSD: fetch.c,v 1.14 1997/08/18 10:20:20 lukem Exp $	*/
 
 /*-
@@ -1725,11 +1725,13 @@ proxy_connect(int socket, char *host, char *cookie)
 
 	if (cookie) {
 		l = asprintf(&connstr, "CONNECT %s:%s HTTP/1.1\r\n"
+			"Host: %s:%s\r\n"
 			"Proxy-Authorization: Basic %s\r\n%s\r\n\r\n",
-			host, port, cookie, HTTP_USER_AGENT);
+			host, port, host, port, cookie, HTTP_USER_AGENT);
 	} else {
-		l = asprintf(&connstr, "CONNECT %s:%s HTTP/1.1\r\n%s\r\n\r\n",
-			host, port, HTTP_USER_AGENT);
+		l = asprintf(&connstr, "CONNECT %s:%s HTTP/1.1\r\n"
+			"Host: %s:%s\r\n%s\r\n\r\n",
+			host, port, host, port, HTTP_USER_AGENT);
 	}
 
 	if (l == -1)
diff --git a/usr.bin/make/expandchildren.c b/usr.bin/make/expandchildren.c
index 22fb3f395..bacae2f22 100644
--- a/usr.bin/make/expandchildren.c
+++ b/usr.bin/make/expandchildren.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: expandchildren.c,v 1.3 2023/09/04 11:35:11 espie Exp $ */
+/*	$OpenBSD: expandchildren.c,v 1.4 2024/04/23 13:34:50 jsg Exp $ */
 /*	$NetBSD: suff.c,v 1.13 1996/11/06 17:59:25 christos Exp $	*/
 
 /*
@@ -133,13 +133,13 @@ ExpandVarChildren(LstNode after, GNode *cgn, GNode *pgn)
 				cp2+=2;
 			else
 				cp2++;
-	    }
+		}
 
-	    if (cp2 != start) {
-		    /* Stuff left over -- add it to the list too.  */
-		    gn = Targ_FindNodei(start, cp2, TARG_CREATE);
-		    Lst_AtEnd(&members, gn);
-	    }
+		if (cp2 != start) {
+			/* Stuff left over -- add it to the list too.  */
+			gn = Targ_FindNodei(start, cp2, TARG_CREATE);
+			Lst_AtEnd(&members, gn);
+		}
 	}
 	/* Add all elements of the members list to the parent node.  */
 	while ((gn = Lst_DeQueue(&members)) != NULL) {
diff --git a/usr.bin/mg/file.c b/usr.bin/mg/file.c
index 8498fd556..dfa4d87f6 100644
--- a/usr.bin/mg/file.c
+++ b/usr.bin/mg/file.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: file.c,v 1.103 2023/03/08 04:43:11 guenther Exp $	*/
+/*	$OpenBSD: file.c,v 1.104 2024/04/23 13:34:50 jsg Exp $	*/
 
 /* This file is in the public domain. */
 
@@ -406,8 +406,8 @@ retry:
 					dobeep();
 					ewprintf("Could not allocate %d bytes",
 					    newsize);
-						s = FIOERR;
-						goto endoffile;
+					s = FIOERR;
+					goto endoffile;
 				}
 				bcopy(line, cp, linesize);
 				free(line);
diff --git a/usr.bin/rdist/docmd.c b/usr.bin/rdist/docmd.c
index 171fb6c35..cbec4721d 100644
--- a/usr.bin/rdist/docmd.c
+++ b/usr.bin/rdist/docmd.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: docmd.c,v 1.35 2022/01/28 06:18:41 guenther Exp $	*/
+/*	$OpenBSD: docmd.c,v 1.36 2024/04/23 13:34:50 jsg Exp $	*/
 
 /*
  * Copyright (c) 1983 Regents of the University of California.
@@ -485,26 +485,26 @@ doarrow(struct cmd *cmd, char **filev)
 	 * b) basename of destination in "install" directive is "."
 	 *    (e.g. install /tmp/.;)
 	 * c) name on left side of -> directive is a directory on local system.
- 	 *
- 	 * We need 2 destdir flags (destdir and ddir) because single directory
- 	 * source is handled differently.  In this case, ddir is 0 (which
- 	 * tells install() not to send DIRTARGET directive to remote rdistd)
- 	 * and destdir is 1 (which tells remfilename() how to build the FILE
- 	 * variables correctly).  In every other case, destdir and ddir will
- 	 * have the same value.
+	 *
+	 * We need 2 destdir flags (destdir and ddir) because single directory
+	 * source is handled differently.  In this case, ddir is 0 (which
+	 * tells install() not to send DIRTARGET directive to remote rdistd)
+	 * and destdir is 1 (which tells remfilename() how to build the FILE
+	 * variables correctly).  In every other case, destdir and ddir will
+	 * have the same value.
 	 */
-  	ddir = files->n_next != NULL;	/* destination is a directory */
+	ddir = files->n_next != NULL;	/* destination is a directory */
 	if (!ddir) {
 		struct stat s;
- 		int isadir = 0;
+		int isadir = 0;
 
 		if (lstat(files->n_name, &s) == 0)
- 			isadir = S_ISDIR(s.st_mode);
- 		if (!isadir && sc->sc_name && *sc->sc_name)
- 			ddir = !strcmp(xbasename(sc->sc_name),".");
- 		destdir = isadir | ddir;
- 	} else
- 		destdir = ddir;
+			isadir = S_ISDIR(s.st_mode);
+		if (!isadir && sc->sc_name && *sc->sc_name)
+			ddir = !strcmp(xbasename(sc->sc_name),".");
+		destdir = isadir | ddir;
+	} else
+		destdir = ddir;
 
 	debugmsg(DM_MISC,
 		 "Debug files->n_next= %p, destdir=%d, ddir=%d",
diff --git a/usr.bin/snmp/snmpc.c b/usr.bin/snmp/snmpc.c
index 831ad5475..bf5dfe9c7 100644
--- a/usr.bin/snmp/snmpc.c
+++ b/usr.bin/snmp/snmpc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: snmpc.c,v 1.40 2022/12/26 19:16:03 jmc Exp $	*/
+/*	$OpenBSD: snmpc.c,v 1.41 2024/04/23 13:34:50 jsg Exp $	*/
 
 /*
  * Copyright (c) 2019 Martijn van Duren <martijn@openbsd.org>
@@ -233,7 +233,7 @@ main(int argc, char *argv[])
 				errx(1, "-3K");
 			}
 			privkeylevel = USM_KEY_LOCALIZED;
-				break;
+			break;
 		case 'k':
 			authkey = snmpc_hex2bin(optarg, &authkeylen);
 			if (authkey == NULL) {
diff --git a/usr.bin/ssh/sshconnect.c b/usr.bin/ssh/sshconnect.c
index 850372cba..8ff922852 100644
--- a/usr.bin/ssh/sshconnect.c
+++ b/usr.bin/ssh/sshconnect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.c,v 1.366 2024/01/11 01:45:36 djm Exp $ */
+/* $OpenBSD: sshconnect.c,v 1.367 2024/04/23 13:34:50 jsg Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -609,7 +609,7 @@ get_hostfile_hostname_ipaddr(char *hostname, struct sockaddr *hostaddr,
 		if (options.proxy_command == NULL) {
 			if (getnameinfo(hostaddr, hostaddr->sa_len,
 			    ntop, sizeof(ntop), NULL, 0, NI_NUMERICHOST) != 0)
-			fatal_f("getnameinfo failed");
+				fatal_f("getnameinfo failed");
 			*hostfile_ipaddr = put_host_port(ntop, port);
 		} else {
 			*hostfile_ipaddr = xstrdup("<no hostip for proxy "
diff --git a/usr.bin/telnet/telnet.c b/usr.bin/telnet/telnet.c
index dfe4c679d..a4ea33cff 100644
--- a/usr.bin/telnet/telnet.c
+++ b/usr.bin/telnet/telnet.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: telnet.c,v 1.36 2019/07/11 03:54:27 deraadt Exp $	*/
+/*	$OpenBSD: telnet.c,v 1.37 2024/04/23 13:34:51 jsg Exp $	*/
 /*	$NetBSD: telnet.c,v 1.7 1996/02/28 21:04:15 thorpej Exp $	*/
 
 /*
@@ -1359,7 +1359,7 @@ env_opt_add(char *ep)
 			opt_add(c);
 		}
 		if ((ep = vp)) {
-				opt_add(NEW_ENV_VALUE);
+			opt_add(NEW_ENV_VALUE);
 			vp = NULL;
 		} else
 			break;
diff --git a/usr.bin/tftp/tftpsubs.c b/usr.bin/tftp/tftpsubs.c
index 85c2e3728..69bc0c14c 100644
--- a/usr.bin/tftp/tftpsubs.c
+++ b/usr.bin/tftp/tftpsubs.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: tftpsubs.c,v 1.15 2012/05/01 04:23:21 gsoares Exp $	*/
+/*	$OpenBSD: tftpsubs.c,v 1.16 2024/04/23 13:34:51 jsg Exp $	*/
 /*	$NetBSD: tftpsubs.c,v 1.3 1994/12/08 09:51:31 jtc Exp $	*/
 
 /*
@@ -165,7 +165,7 @@ read_ahead(FILE *file, int convert, int segment_size)
 				newline = 1;
 			}
 		}
-	       *p++ = c;
+		*p++ = c;
 	}
 	b->counter = (int)(p - dp->th_data);
 }
diff --git a/usr.bin/tmux/cmd-queue.c b/usr.bin/tmux/cmd-queue.c
index 3ce516803..623535a12 100644
--- a/usr.bin/tmux/cmd-queue.c
+++ b/usr.bin/tmux/cmd-queue.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cmd-queue.c,v 1.115 2023/09/15 06:31:49 nicm Exp $ */
+/* $OpenBSD: cmd-queue.c,v 1.116 2024/04/23 13:34:51 jsg Exp $ */
 
 /*
  * Copyright (c) 2013 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -806,10 +806,10 @@ cmdq_running(struct client *c)
 	struct cmdq_list	*queue = cmdq_get(c);
 
 	if (queue->item == NULL)
-        return (NULL);
-    if (queue->item->flags & CMDQ_WAITING)
-        return (NULL);
-    return (queue->item);
+		return (NULL);
+	if (queue->item->flags & CMDQ_WAITING)
+		return (NULL);
+	return (queue->item);
 }
 
 /* Print a guard line. */
diff --git a/usr.bin/tmux/window-copy.c b/usr.bin/tmux/window-copy.c
index 3ae46cdc9..6c43d4010 100644
--- a/usr.bin/tmux/window-copy.c
+++ b/usr.bin/tmux/window-copy.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: window-copy.c,v 1.347 2024/03/26 10:20:20 nicm Exp $ */
+/* $OpenBSD: window-copy.c,v 1.348 2024/04/23 13:34:51 jsg Exp $ */
 
 /*
  * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -4694,7 +4694,7 @@ window_copy_get_selection(struct window_mode_entry *wme, size_t *len)
 	if (keys == MODEKEY_EMACS || lastex <= ey_last) {
 		if (~grid_get_line(data->backing->grid, ey)->flags &
 		    GRID_LINE_WRAPPED || lastex != ey_last)
-		off -= 1;
+			off -= 1;
 	}
 	*len = off;
 	return (buf);
diff --git a/usr.sbin/amd/amd/amq_subr.c b/usr.sbin/amd/amd/amq_subr.c
index c1fce38b3..174fb7c23 100644
--- a/usr.sbin/amd/amd/amq_subr.c
+++ b/usr.sbin/amd/amd/amq_subr.c
@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)amq_subr.c	8.1 (Berkeley) 6/6/93
- *	$Id: amq_subr.c,v 1.19 2022/12/28 21:30:15 jmc Exp $
+ *	$Id: amq_subr.c,v 1.20 2024/04/23 13:34:51 jsg Exp $
  */
 
 /*
@@ -300,7 +300,7 @@ xdr_amq_mount_stats(XDR *xdrs, amq_mount_stats *objp)
 bool_t
 xdr_amq_mount_tree_list(XDR *xdrs, amq_mount_tree_list *objp)
 {
-	 if (!xdr_array(xdrs, (char **)&objp->amq_mount_tree_list_val, (u_int *)&objp->amq_mount_tree_list_len, ~0, sizeof(amq_mount_tree_p), xdr_amq_mount_tree_p)) {
+	if (!xdr_array(xdrs, (char **)&objp->amq_mount_tree_list_val, (u_int *)&objp->amq_mount_tree_list_len, ~0, sizeof(amq_mount_tree_p), xdr_amq_mount_tree_p)) {
 		return (FALSE);
 	}
 	return (TRUE);
diff --git a/usr.sbin/amd/amd/nfs_ops.c b/usr.sbin/amd/amd/nfs_ops.c
index 7c2e01e6a..2ad336386 100644
--- a/usr.sbin/amd/amd/nfs_ops.c
+++ b/usr.sbin/amd/amd/nfs_ops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs_ops.c,v 1.27 2021/10/21 10:55:56 deraadt Exp $	*/
+/*	$OpenBSD: nfs_ops.c,v 1.28 2024/04/23 13:34:51 jsg Exp $	*/
 
 /*-
  * Copyright (c) 1990 Jan-Simon Pendry
@@ -377,7 +377,7 @@ call_mountd(fh_cache *fp, u_long proc, fwd_fun f, void *wchan)
  * to be redone.  The quick solution here is to invalidate the MOUNTD
  * port.
  */
-      fp->fh_sin.sin_port = 0;
+	fp->fh_sin.sin_port = 0;
 
 	return error;
 }
diff --git a/usr.sbin/dvmrpd/dvmrpe.c b/usr.sbin/dvmrpd/dvmrpe.c
index c799e37e8..17071a5bc 100644
--- a/usr.sbin/dvmrpd/dvmrpe.c
+++ b/usr.sbin/dvmrpd/dvmrpe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dvmrpe.c,v 1.23 2021/01/19 12:29:46 claudio Exp $ */
+/*	$OpenBSD: dvmrpe.c,v 1.24 2024/04/23 13:34:51 jsg Exp $ */
 
 /*
  * Copyright (c) 2005 Claudio Jeker <claudio@openbsd.org>
@@ -314,7 +314,7 @@ dvmrpe_dispatch_rde(int fd, short event, void *bula)
 	ssize_t			 n;
 	int			 shut = 0;
 
-	 if (event & EV_READ) {
+	if (event & EV_READ) {
 		if ((n = imsg_read(ibuf)) == -1 && errno != EAGAIN)
 			fatal("imsg_read error");
 		if (n == 0)	/* connection closed */
diff --git a/usr.sbin/dvmrpd/probe.c b/usr.sbin/dvmrpd/probe.c
index 98b803c8d..6a8d32a84 100644
--- a/usr.sbin/dvmrpd/probe.c
+++ b/usr.sbin/dvmrpd/probe.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: probe.c,v 1.5 2023/06/26 10:08:56 claudio Exp $ */
+/*	$OpenBSD: probe.c,v 1.6 2024/04/23 13:34:51 jsg Exp $ */
 
 /*
  * Copyright (c) 2005, 2006 Esben Norby <norby@openbsd.org>
@@ -115,7 +115,7 @@ recv_probe(struct iface *iface, struct in_addr src, u_int32_t src_ip,
 		if (nbr_id == iface->addr.s_addr) {
 			/* seen myself */
 			if (nbr->state < NBR_STA_2_WAY)
-			nbr_fsm(nbr, NBR_EVT_2_WAY_RCVD);
+				nbr_fsm(nbr, NBR_EVT_2_WAY_RCVD);
 			break;
 		}
 		buf += sizeof(nbr_id);
diff --git a/usr.sbin/ifstated/ifstated.c b/usr.sbin/ifstated/ifstated.c
index 80e5c48ea..66297283e 100644
--- a/usr.sbin/ifstated/ifstated.c
+++ b/usr.sbin/ifstated/ifstated.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ifstated.c,v 1.67 2022/12/28 21:30:16 jmc Exp $	*/
+/*	$OpenBSD: ifstated.c,v 1.68 2024/04/23 13:34:51 jsg Exp $	*/
 
 /*
  * Copyright (c) 2004 Marco Pfatschbacher <mpf@openbsd.org>
@@ -548,7 +548,7 @@ adjust_expressions(struct ifsd_expression_list *expressions, int depth)
 			}
 			if (expression->parent != NULL) {
 				if (TAILQ_EMPTY(&nexpressions))
-				te = NULL;
+					te = NULL;
 				TAILQ_FOREACH(te, &nexpressions, eval)
 					if (expression->parent == te)
 						break;
diff --git a/usr.sbin/ldpd/lde.c b/usr.sbin/ldpd/lde.c
index 1f41a59d6..b16ad2ac2 100644
--- a/usr.sbin/ldpd/lde.c
+++ b/usr.sbin/ldpd/lde.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lde.c,v 1.77 2023/12/14 11:10:19 claudio Exp $ */
+/*	$OpenBSD: lde.c,v 1.78 2024/04/23 13:34:51 jsg Exp $ */
 
 /*
  * Copyright (c) 2013, 2016 Renato Westphal <renato@openbsd.org>
@@ -1163,7 +1163,7 @@ lde_nbr_clear(void)
 {
 	struct lde_nbr	*ln;
 
-	 while ((ln = RB_ROOT(&lde_nbrs)) != NULL)
+	while ((ln = RB_ROOT(&lde_nbrs)) != NULL)
 		lde_nbr_del(ln);
 }
 
diff --git a/usr.sbin/lpr/common_source/displayq.c b/usr.sbin/lpr/common_source/displayq.c
index 4eb544202..f43c64e47 100644
--- a/usr.sbin/lpr/common_source/displayq.c
+++ b/usr.sbin/lpr/common_source/displayq.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: displayq.c,v 1.40 2018/04/26 12:42:51 guenther Exp $	*/
+/*	$OpenBSD: displayq.c,v 1.41 2024/04/23 13:34:51 jsg Exp $	*/
 /*	$NetBSD: displayq.c,v 1.21 2001/08/30 00:51:50 itojun Exp $	*/
 
 /*
@@ -462,9 +462,9 @@ dump(char *nfile, char *file, int copies)
 	 * Print as many files as will fit
 	 *  (leaving room for the total size)
 	 */
-	 fill = first ? 0 : 2;	/* fill space for ``, '' */
-	 if (((n = strlen(nfile)) + col + fill) >=
-	     (termwidth - (80 - SIZCOL)) - 4) {
+	fill = first ? 0 : 2;	/* fill space for ``, '' */
+	if (((n = strlen(nfile)) + col + fill) >=
+	    (termwidth - (80 - SIZCOL)) - 4) {
 		if (col < (termwidth - (80 - SIZCOL))) {
 			printf(" ..."), col += 4;
 			blankfill(termwidth - (80 - SIZCOL));
diff --git a/usr.sbin/makefs/msdos/msdosfs_fat.c b/usr.sbin/makefs/msdos/msdosfs_fat.c
index bcf2cc845..cf64f8b0f 100644
--- a/usr.sbin/makefs/msdos/msdosfs_fat.c
+++ b/usr.sbin/makefs/msdos/msdosfs_fat.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: msdosfs_fat.c,v 1.7 2022/01/11 05:34:33 jsg Exp $	*/
+/*	$OpenBSD: msdosfs_fat.c,v 1.8 2024/04/23 13:34:51 jsg Exp $	*/
 /*	$NetBSD: msdosfs_fat.c,v 1.31 2016/05/07 16:43:02 mlelstv Exp $	*/
 
 /*-
@@ -1065,7 +1065,7 @@ extendfile(struct denode *dep, u_long count, struct mkfsbuf **bpp, u_long *ncp,
 				clrbuf(bp);
 				if (bpp) {
 					*bpp = bp;
-						bpp = NULL;
+					bpp = NULL;
 				} else {
 					bdwrite(bp);
 				}
diff --git a/usr.sbin/mopd/common/print.c b/usr.sbin/mopd/common/print.c
index 524dd6e21..266028c18 100644
--- a/usr.sbin/mopd/common/print.c
+++ b/usr.sbin/mopd/common/print.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: print.c,v 1.14 2022/12/28 21:30:17 jmc Exp $ */
+/*	$OpenBSD: print.c,v 1.15 2024/04/23 13:34:51 jsg Exp $ */
 
 /*
  * Copyright (c) 1993-96 Mats O Jansson.  All rights reserved.
@@ -135,7 +135,7 @@ mopPrintOneline(FILE *fd, u_char *pkt, int trans)
 	mopPrintHWA(fd, src); fprintf(fd, " > ");
 	mopPrintHWA(fd, dst);
 	if (len < 1600)
-	fprintf(fd, " len %4d code %02x ", len, code);
+		fprintf(fd, " len %4d code %02x ", len, code);
 	else
 		fprintf(fd, " len %4d code %02x ",
 		    (len % 256)*256 + (len /256), code);
diff --git a/usr.sbin/mtree/compare.c b/usr.sbin/mtree/compare.c
index 6ac3ff765..9e1097aa6 100644
--- a/usr.sbin/mtree/compare.c
+++ b/usr.sbin/mtree/compare.c
@@ -1,5 +1,5 @@
 /*	$NetBSD: compare.c,v 1.11 1996/09/05 09:56:48 mycroft Exp $	*/
-/*	$OpenBSD: compare.c,v 1.30 2023/08/11 05:07:28 guenther Exp $	*/
+/*	$OpenBSD: compare.c,v 1.31 2024/04/23 13:34:51 jsg Exp $	*/
 
 /*-
  * Copyright (c) 1989, 1993
@@ -328,7 +328,7 @@ typeerr:		LABEL;
 						  "-" : db_flags,
 						  (*cur_flags == '\0') ?
 						  "-" : cur_flags);
-				tab = "\t";
+			tab = "\t";
 			if (uflag)
 				if (chflags(p->fts_accpath, s->file_flags))
 					(void)printf(", not modified: %s)\n",
diff --git a/usr.sbin/ntpd/control.c b/usr.sbin/ntpd/control.c
index 6ca4cefea..824941186 100644
--- a/usr.sbin/ntpd/control.c
+++ b/usr.sbin/ntpd/control.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: control.c,v 1.20 2023/12/20 15:36:36 otto Exp $ */
+/*	$OpenBSD: control.c,v 1.21 2024/04/23 13:34:51 jsg Exp $ */
 
 /*
  * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -251,7 +251,7 @@ control_dispatch_msg(struct pollfd *pfd, u_int *ctl_cnt)
 				build_show_sensor(&c_sensor, s);
 				imsg_compose(&c->ibuf, IMSG_CTL_SHOW_SENSORS,
 				    0, 0, -1, &c_sensor, sizeof(c_sensor));
-			cnt++;
+				cnt++;
 			}
 			imsg_compose(&c->ibuf, IMSG_CTL_SHOW_SENSORS_END,
 			    0, 0, -1, &cnt, sizeof(cnt));
@@ -276,7 +276,7 @@ control_dispatch_msg(struct pollfd *pfd, u_int *ctl_cnt)
 				build_show_sensor(&c_sensor, s);
 				imsg_compose(&c->ibuf, IMSG_CTL_SHOW_SENSORS,
 				    0, 0, -1, &c_sensor, sizeof(c_sensor));
-			cnt++;
+				cnt++;
 			}
 			imsg_compose(&c->ibuf, IMSG_CTL_SHOW_SENSORS_END,
 			    0, 0, -1, &cnt, sizeof(cnt));
diff --git a/usr.sbin/pcidump/pcidump.c b/usr.sbin/pcidump/pcidump.c
index c7dc589ce..9643402ec 100644
--- a/usr.sbin/pcidump/pcidump.c
+++ b/usr.sbin/pcidump/pcidump.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: pcidump.c,v 1.70 2024/02/01 18:26:45 kettenis Exp $	*/
+/*	$OpenBSD: pcidump.c,v 1.71 2024/04/23 13:34:51 jsg Exp $	*/
 
 /*
  * Copyright (c) 2006, 2007 David Gwynne <loki@animata.net>
@@ -337,11 +337,11 @@ probe(int bus, int dev, int func)
 
 	if (vendor != NULL) {
 		for (pkp = pci_known_products; pkp->productname != NULL; pkp++)
-		if (pkp->vendor == PCI_VENDOR(id_reg) &&
-		    pkp->product == PCI_PRODUCT(id_reg)) {
-			product = pkp->productname;
-			break;
-		}
+			if (pkp->vendor == PCI_VENDOR(id_reg) &&
+				pkp->product == PCI_PRODUCT(id_reg)) {
+				product = pkp->productname;
+				break;
+			}
 	}
 
 	printf(" %d:%d:%d: %s %s\n", bus, dev, func,
diff --git a/usr.sbin/quot/quot.c b/usr.sbin/quot/quot.c
index 1617ce4f5..16f5949f8 100644
--- a/usr.sbin/quot/quot.c
+++ b/usr.sbin/quot/quot.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: quot.c,v 1.32 2018/09/18 03:09:55 millert Exp $	*/
+/*	$OpenBSD: quot.c,v 1.33 2024/04/23 13:34:51 jsg Exp $	*/
 
 /*
  * Copyright (C) 1991, 1994 Wolfgang Solfrank.
@@ -103,8 +103,9 @@ get_inode(int fd, struct fs *super, ino_t ino)
 			if (pread(fd, cgp, super->fs_cgsize,
 			    (off_t)cgtod(super, cg) << super->fs_fshift)
 			    != super->fs_cgsize)
-			if (read(fd, cgp, super->fs_cgsize) != super->fs_cgsize)
-				err(1, "read cg");
+				if (read(fd, cgp, super->fs_cgsize) !=
+				    super->fs_cgsize)
+					err(1, "read cg");
 			if (!cg_chkmagic(cgp))
 				errx(1, "cg has bad magic");
 		}
diff --git a/usr.sbin/rad/frontend.c b/usr.sbin/rad/frontend.c
index 352479ffb..6748e4373 100644
--- a/usr.sbin/rad/frontend.c
+++ b/usr.sbin/rad/frontend.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: frontend.c,v 1.44 2024/02/11 21:29:12 bluhm Exp $	*/
+/*	$OpenBSD: frontend.c,v 1.45 2024/04/23 22:11:59 florian Exp $	*/
 
 /*
  * Copyright (c) 2018 Florian Obser <florian@openbsd.org>
@@ -1157,6 +1157,14 @@ build_packet(struct ra_iface *ra_iface)
 	else if (ra_options_conf->dfr) {
 		ra->nd_ra_router_lifetime =
 		    htons(ra_options_conf->router_lifetime);
+		/*
+		 * RFC 4191
+		 * If the Router Lifetime is zero, the preference value MUST be
+		 * set to (00) by the sender and MUST be ignored by the
+		 * receiver.
+		 */
+		if (ra_options_conf->router_lifetime > 0)
+			ra->nd_ra_flags_reserved |= ra_options_conf->rtpref;
 	}
 	ra->nd_ra_reachable = htonl(ra_options_conf->reachable_time);
 	ra->nd_ra_retransmit = htonl(ra_options_conf->retrans_timer);
diff --git a/usr.sbin/rad/parse.y b/usr.sbin/rad/parse.y
index 6ebd4eeb5..66cc0c0ab 100644
--- a/usr.sbin/rad/parse.y
+++ b/usr.sbin/rad/parse.y
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parse.y,v 1.21 2022/10/15 13:27:45 florian Exp $	*/
+/*	$OpenBSD: parse.y,v 1.22 2024/04/23 22:11:59 florian Exp $	*/
 
 /*
  * Copyright (c) 2018 Florian Obser <florian@openbsd.org>
@@ -29,6 +29,7 @@
 #include <sys/stat.h>
 
 #include <netinet/in.h>
+#include <netinet/icmp6.h>
 #include <net/if.h>
 
 #include <arpa/inet.h>
@@ -119,8 +120,8 @@ typedef struct {
 %token	RA_IFACE YES NO INCLUDE ERROR
 %token	DEFAULT ROUTER HOP LIMIT MANAGED ADDRESS
 %token	CONFIGURATION OTHER LIFETIME REACHABLE TIME RETRANS TIMER
-%token	AUTO PREFIX VALID PREFERRED LIFETIME ONLINK AUTONOMOUS
-%token	ADDRESS_CONFIGURATION DNS NAMESERVER SEARCH MTU NAT64
+%token	AUTO PREFIX VALID PREFERENCE PREFERRED LIFETIME ONLINK AUTONOMOUS
+%token	ADDRESS_CONFIGURATION DNS NAMESERVER SEARCH MTU NAT64 HIGH MEDIUM LOW
 
 %token	<v.string>	STRING
 %token	<v.number>	NUMBER
@@ -210,6 +211,15 @@ ra_opt_block	: DEFAULT ROUTER yesno {
 		| ROUTER LIFETIME NUMBER {
 			ra_options->router_lifetime = $3;
 		}
+		| ROUTER PREFERENCE HIGH {
+			ra_options->rtpref = ND_RA_FLAG_RTPREF_HIGH;
+		}
+		| ROUTER PREFERENCE MEDIUM {
+			ra_options->rtpref = ND_RA_FLAG_RTPREF_MEDIUM;
+		}
+		| ROUTER PREFERENCE LOW {
+			ra_options->rtpref = ND_RA_FLAG_RTPREF_LOW;
+		}
 		| REACHABLE TIME NUMBER {
 			ra_options->reachable_time = $3;
 		}
@@ -507,18 +517,22 @@ lookup(char *s)
 		{"configuration",	CONFIGURATION},
 		{"default",		DEFAULT},
 		{"dns",			DNS},
+		{"high",		HIGH},
 		{"hop",			HOP},
 		{"include",		INCLUDE},
 		{"interface",		RA_IFACE},
 		{"lifetime",		LIFETIME},
 		{"limit",		LIMIT},
+		{"low",			LOW},
 		{"managed",		MANAGED},
+		{"medium",		MEDIUM},
 		{"mtu",			MTU},
 		{"nameserver",		NAMESERVER},
 		{"nat64",		NAT64},
 		{"no",			NO},
 		{"on-link",		ONLINK},
 		{"other",		OTHER},
+		{"preference",		PREFERENCE},
 		{"preferred",		PREFERRED},
 		{"prefix",		PREFIX},
 		{"reachable",		REACHABLE},
diff --git a/usr.sbin/rad/printconf.c b/usr.sbin/rad/printconf.c
index f664e58de..184a5df2d 100644
--- a/usr.sbin/rad/printconf.c
+++ b/usr.sbin/rad/printconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: printconf.c,v 1.7 2022/10/15 13:26:15 florian Exp $	*/
+/*	$OpenBSD: printconf.c,v 1.8 2024/04/23 22:11:59 florian Exp $	*/
 
 /*
  * Copyright (c) 2018 Florian Obser <florian@openbsd.org>
@@ -23,6 +23,7 @@
 #include <sys/uio.h>
 
 #include <netinet/in.h>
+#include <netinet/icmp6.h>
 #include <net/if.h>
 
 #include <arpa/inet.h>
@@ -34,6 +35,7 @@
 #include "rad.h"
 
 const char*	yesno(int);
+const char*	rtpref(int);
 void		print_ra_options(const char*, const struct ra_options_conf*);
 void		print_prefix_options(const char*, const struct ra_prefix_conf*);
 
@@ -43,6 +45,22 @@ yesno(int flag)
 	return flag ? "yes" : "no";
 }
 
+const char*
+rtpref(int rtpref)
+{
+	switch (rtpref & ND_RA_FLAG_RTPREF_MASK) {
+	case ND_RA_FLAG_RTPREF_HIGH:
+		return "high";
+	case ND_RA_FLAG_RTPREF_MEDIUM:
+		return "medium";
+	case ND_RA_FLAG_RTPREF_LOW:
+		return "low";
+	default:
+		return "invalid";
+	}
+
+}
+
 void
 print_ra_options(const char *indent, const struct ra_options_conf *ra_options)
 {
@@ -56,6 +74,7 @@ print_ra_options(const char *indent, const struct ra_options_conf *ra_options)
 	printf("%smanaged address configuration %s\n", indent,
 	    yesno(ra_options->m_flag));
 	printf("%sother configuration %s\n", indent, yesno(ra_options->o_flag));
+	printf("%srouter preference %s\n", indent, rtpref(ra_options->rtpref));
 	printf("%srouter lifetime %d\n", indent, ra_options->router_lifetime);
 	printf("%sreachable time %u\n", indent, ra_options->reachable_time);
 	printf("%sretrans timer %u\n", indent, ra_options->retrans_timer);
diff --git a/usr.sbin/rad/rad.conf.5 b/usr.sbin/rad/rad.conf.5
index 3f71a9aee..f82ccfd21 100644
--- a/usr.sbin/rad/rad.conf.5
+++ b/usr.sbin/rad/rad.conf.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: rad.conf.5,v 1.21 2023/04/27 16:56:52 phessler Exp $
+.\"	$OpenBSD: rad.conf.5,v 1.23 2024/04/23 22:17:49 florian Exp $
 .\"
 .\" Copyright (c) 2018 Florian Obser <florian@openbsd.org>
 .\" Copyright (c) 2005 Esben Norby <norby@openbsd.org>
@@ -18,7 +18,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: April 27 2023 $
+.Dd $Mdocdate: April 23 2024 $
 .Dt RAD.CONF 5
 .Os
 .Sh NAME
@@ -120,6 +120,9 @@ like NTP servers or DNS name servers.
 The number of seconds this router is a valid default router after receiving
 a router advertisement message.
 The default is 1800 seconds.
+.It Ic router preference Pq Ic high Ns | Ns Ic medium Ns | Ns Ic low
+Indicate whether to prefer this router over other default routers.
+The default is medium.
 .\" .It Ic reachable time Ar number
 .\" XXX
 .\" .It Ic retrans timer Ar number
diff --git a/usr.sbin/rad/rad.h b/usr.sbin/rad/rad.h
index 714bb9376..787e78c7c 100644
--- a/usr.sbin/rad/rad.h
+++ b/usr.sbin/rad/rad.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: rad.h,v 1.25 2023/04/27 16:56:52 phessler Exp $	*/
+/*	$OpenBSD: rad.h,v 1.26 2024/04/23 22:11:59 florian Exp $	*/
 
 /*
  * Copyright (c) 2018 Florian Obser <florian@openbsd.org>
@@ -93,6 +93,7 @@ struct ra_options_conf {
 	int		cur_hl;			/* current hop limit */
 	int		m_flag;			/* managed address conf flag */
 	int		o_flag;			/* other conf flag */
+	int		rtpref;			/* router preference */
 	int		router_lifetime;	/* default router lifetime */
 	uint32_t	reachable_time;
 	uint32_t	retrans_timer;
diff --git a/usr.sbin/radiusd/radiusd_standard.c b/usr.sbin/radiusd/radiusd_standard.c
index f819e3b47..68d5f8e0f 100644
--- a/usr.sbin/radiusd/radiusd_standard.c
+++ b/usr.sbin/radiusd/radiusd_standard.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: radiusd_standard.c,v 1.4 2024/02/09 07:41:32 yasuoka Exp $	*/
+/*	$OpenBSD: radiusd_standard.c,v 1.5 2024/04/23 13:34:51 jsg Exp $	*/
 
 /*
  * Copyright (c) 2013, 2023 Internet Initiative Japan Inc.
@@ -272,7 +272,7 @@ module_standard_resdeco(void *ctx, u_int q_id, const u_char *req, size_t reqlen,
 	TAILQ_FOREACH(attr, &module->remove_resattrs, next) {
 		if (radres == NULL &&
 		    (radres = radius_convert_packet(res, reslen)) == NULL) {
-			 syslog(LOG_ERR,
+			syslog(LOG_ERR,
 			    "%s: radius_convert_packet() failed: %m", __func__);
 			module_stop(module->base);
 			return;
diff --git a/usr.sbin/ripd/auth.c b/usr.sbin/ripd/auth.c
index 104497406..e48b880b5 100644
--- a/usr.sbin/ripd/auth.c
+++ b/usr.sbin/ripd/auth.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: auth.c,v 1.13 2023/06/22 10:38:27 claudio Exp $ */
+/*	$OpenBSD: auth.c,v 1.14 2024/04/23 13:34:51 jsg Exp $ */
 
 /*
  * Copyright (c) 2006 Michele Marchetto <mydecay@openbeer.it>
@@ -251,7 +251,7 @@ auth_add_trailer(struct ibuf *buf, struct iface *iface)
 	    iface->auth_keyid)) == NULL) {
 		log_debug("auth_add_trailer: keyid %d not configured, "
 		    "interface %s", iface->auth_keyid, iface->name);
-			return (-1);
+		return (-1);
 	}
 
 	memcpy(digest, md->key, MD5_DIGEST_LENGTH);
diff --git a/usr.sbin/rpki-client/http.c b/usr.sbin/rpki-client/http.c
index fdf57974f..78ee91e57 100644
--- a/usr.sbin/rpki-client/http.c
+++ b/usr.sbin/rpki-client/http.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: http.c,v 1.83 2024/04/17 14:01:17 claudio Exp $ */
+/*	$OpenBSD: http.c,v 1.85 2024/04/23 10:27:46 tb Exp $ */
 /*
  * Copyright (c) 2020 Nils Fisher <nils_fisher@hotmail.com>
  * Copyright (c) 2020 Claudio Jeker <claudio@openbsd.org>
@@ -1162,7 +1162,8 @@ proxy_connect(struct http_connection *conn)
 	conn->bufpos = 0;
 	/* XXX handle auth */
 	if ((r = asprintf(&conn->buf, "CONNECT %s HTTP/1.1\r\n"
-	    "User-Agent: " HTTP_USER_AGENT "\r\n%s\r\n", host,
+	    "Host: %s\r\n"
+	    "User-Agent: " HTTP_USER_AGENT "\r\n%s\r\n", host, host,
 	    proxy.proxyauth)) == -1)
 		err(1, NULL);
 	conn->bufsz = r;
diff --git a/usr.sbin/sasyncd/carp.c b/usr.sbin/sasyncd/carp.c
index ea35db196..881bb32d6 100644
--- a/usr.sbin/sasyncd/carp.c
+++ b/usr.sbin/sasyncd/carp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: carp.c,v 1.18 2023/02/08 08:20:54 tb Exp $	*/
+/*	$OpenBSD: carp.c,v 1.19 2024/04/23 13:34:51 jsg Exp $	*/
 
 /*
  * Copyright (c) 2005 Håkan Olsson.  All rights reserved.
@@ -127,7 +127,7 @@ carp_demote(int demote, int force)
 			log_msg(1, "carp_demote: unable to get "
 			    "the demote state of group '%s'",
 			    cfgstate.carp_ifgroup);
-			    goto done;
+			goto done;
 		}
 
 		if (ifgr.ifgr_attrib.ifg_carp_demoted == 0)
diff --git a/usr.sbin/smtpd/lka_filter.c b/usr.sbin/smtpd/lka_filter.c
index 595961ca8..083627494 100644
--- a/usr.sbin/smtpd/lka_filter.c
+++ b/usr.sbin/smtpd/lka_filter.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: lka_filter.c,v 1.74 2023/11/03 13:38:28 op Exp $	*/
+/*	$OpenBSD: lka_filter.c,v 1.75 2024/04/23 13:34:51 jsg Exp $	*/
 
 /*
  * Copyright (c) 2018 Gilles Chehade <gilles@poolp.org>
@@ -729,7 +729,7 @@ filter_protocol_internal(struct filter_session *fs, uint64_t *token, uint64_t re
 			    filter->name,
 			    param,
 			    filter->config->rewrite);
-			    filter_result_rewrite(reqid, filter->config->rewrite);
+			filter_result_rewrite(reqid, filter->config->rewrite);
 			return;
 		}
 		else if (filter->config->disconnect) {
diff --git a/usr.sbin/smtpd/mda_variables.c b/usr.sbin/smtpd/mda_variables.c
index 0f2be7722..0542f95de 100644
--- a/usr.sbin/smtpd/mda_variables.c
+++ b/usr.sbin/smtpd/mda_variables.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mda_variables.c,v 1.9 2023/03/19 16:43:44 millert Exp $	*/
+/*	$OpenBSD: mda_variables.c,v 1.10 2024/04/23 13:34:51 jsg Exp $	*/
 
 /*
  * Copyright (c) 2011-2017 Gilles Chehade <gilles@poolp.org>
@@ -74,27 +74,27 @@ mda_expand_token(char *dest, size_t len, const char *token,
 			return -1;
 
 		*lbracket = *rbracket = '\0';
-		 content  = lbracket + 1;
+		content  = lbracket + 1;
 
-		 if ((sep = strchr(content, ':')) == NULL)
-			 endoff = begoff = strtonum(content, -EXPAND_BUFFER,
-			     EXPAND_BUFFER, &errstr);
-		 else {
-			 *sep = '\0';
-			 if (content != sep)
-				 begoff = strtonum(content, -EXPAND_BUFFER,
-				     EXPAND_BUFFER, &errstr);
-			 if (*(++sep)) {
-				 if (errstr == NULL)
-					 endoff = strtonum(sep, -EXPAND_BUFFER,
-					     EXPAND_BUFFER, &errstr);
-			 }
-		 }
-		 if (errstr)
-			 return -1;
+		if ((sep = strchr(content, ':')) == NULL)
+			endoff = begoff = strtonum(content, -EXPAND_BUFFER,
+			    EXPAND_BUFFER, &errstr);
+		else {
+			*sep = '\0';
+			if (content != sep)
+				begoff = strtonum(content, -EXPAND_BUFFER,
+				    EXPAND_BUFFER, &errstr);
+			if (*(++sep)) {
+				if (errstr == NULL)
+					endoff = strtonum(sep, -EXPAND_BUFFER,
+					    EXPAND_BUFFER, &errstr);
+			}
+		}
+		if (errstr)
+			return -1;
 
-		 /* token:mod_1,mod_2,mod_n -> extract modifiers */
-		 mods = strchr(rbracket + 1, ':');
+		/* token:mod_1,mod_2,mod_n -> extract modifiers */
+		mods = strchr(rbracket + 1, ':');
 	} else {
 		if ((mods = strchr(rtoken, ':')) != NULL)
 			*mods++ = '\0';
diff --git a/usr.sbin/smtpd/mta.c b/usr.sbin/smtpd/mta.c
index fe433220a..8022d23ec 100644
--- a/usr.sbin/smtpd/mta.c
+++ b/usr.sbin/smtpd/mta.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: mta.c,v 1.247 2024/01/03 08:11:15 op Exp $	*/
+/*	$OpenBSD: mta.c,v 1.248 2024/04/23 13:34:51 jsg Exp $	*/
 
 /*
  * Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -1364,7 +1364,7 @@ mta_connect(struct mta_connector *c)
 	mta_session(c->relay, route, mx->mxname);	/* this never fails synchronously */
 	mta_relay_ref(c->relay);
 
-    goto again;
+	goto again;
 }
 
 static void
diff --git a/usr.sbin/tcpdump/print-ospf.c b/usr.sbin/tcpdump/print-ospf.c
index 43068928a..f567228eb 100644
--- a/usr.sbin/tcpdump/print-ospf.c
+++ b/usr.sbin/tcpdump/print-ospf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: print-ospf.c,v 1.22 2020/01/24 22:46:37 procter Exp $	*/
+/*	$OpenBSD: print-ospf.c,v 1.23 2024/04/23 13:34:51 jsg Exp $	*/
 
 /*
  * Copyright (c) 1992, 1993, 1994, 1995, 1996, 1997
@@ -343,7 +343,7 @@ ospf_print_lsa(const struct lsa *lsap)
 				    (u_int32_t)ntohl(mcp->mcla_vtype));
 				break;
 			}
-		++mcp;
+			++mcp;
 		}
 	}
 
diff --git a/usr.sbin/tcpdump/print-slow.c b/usr.sbin/tcpdump/print-slow.c
index d05117b7f..4643f7851 100644
--- a/usr.sbin/tcpdump/print-slow.c
+++ b/usr.sbin/tcpdump/print-slow.c
@@ -1,4 +1,4 @@
-/* 	$OpenBSD: print-slow.c,v 1.4 2015/11/16 00:16:39 mmcc Exp $ 	*/
+/* 	$OpenBSD: print-slow.c,v 1.5 2024/04/23 13:34:51 jsg Exp $ 	*/
 
 /*
  * Copyright (c) 1998-2005 The TCPDUMP project
@@ -261,7 +261,7 @@ slow_print(const u_char *pptr, u_int len)
 		tlen -= tlv_len;
 	}
 
-    return;
+	return;
 trunc:
-    printf("\n\t[|slow]");
+	printf("\n\t[|slow]");
 }
diff --git a/usr.sbin/tcpdump/print-snmp.c b/usr.sbin/tcpdump/print-snmp.c
index c3e74537c..800c4576f 100644
--- a/usr.sbin/tcpdump/print-snmp.c
+++ b/usr.sbin/tcpdump/print-snmp.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: print-snmp.c,v 1.29 2024/02/03 00:20:21 jsg Exp $	*/
+/*	$OpenBSD: print-snmp.c,v 1.30 2024/04/23 13:34:51 jsg Exp $	*/
 
 /*
  * Copyright (c) 1990, 1991, 1993, 1994, 1995, 1996, 1997
@@ -662,7 +662,7 @@ asn1_print(struct be *elem)
 	case BE_NULL:
 		break;
 	case BE_OID: {
-	int o = 0, first = -1, i = asnlen;
+		int o = 0, first = -1, i = asnlen;
 
 		if (!nflag && asnlen > 2) {
 			struct obj_abrev *a = &obj_abrev_list[0];