10 files changed, 212 insertions, 143 deletions

diff --git a/sbin/fsck_ffs/setup.c b/sbin/fsck_ffs/setup.c
index f10f02d159c3..41b4a5336350 100644
--- a/sbin/fsck_ffs/setup.c
+++ b/sbin/fsck_ffs/setup.c
@@ -58,7 +58,6 @@ char *copybuf;			       /* buffer to copy snapshot blocks */
 static int sbhashfailed;
 #define POWEROF2(num)	(((num) & ((num) - 1)) == 0)
 
-static int calcsb(char *dev, int devfd, struct fs *fs);
 static void saverecovery(int readfd, int writefd);
 static int chkrecovery(int devfd);
 static int getlbnblkno(struct inodesc *);
@@ -501,52 +500,6 @@ sblock_init(void)
 }
 
 /*
- * Calculate a prototype superblock based on information in the boot area.
- * When done the cgsblock macro can be calculated and the fs_ncg field
- * can be used. Do NOT attempt to use other macros without verifying that
- * their needed information is available!
- */
-static int
-calcsb(char *dev, int devfd, struct fs *fs)
-{
-	struct fsrecovery *fsr;
-	char *fsrbuf;
-	u_int secsize;
-
-	/*
-	 * We need fragments-per-group and the partition-size.
-	 *
-	 * Newfs stores these details at the end of the boot block area
-	 * at the start of the filesystem partition. If they have been
-	 * overwritten by a boot block, we fail. But usually they are
-	 * there and we can use them.
-	 */
-	if (ioctl(devfd, DIOCGSECTORSIZE, &secsize) == -1)
-		return (0);
-	fsrbuf = Balloc(secsize);
-	if (fsrbuf == NULL)
-		errx(EEXIT, "calcsb: cannot allocate recovery buffer");
-	if (blread(devfd, fsrbuf,
-	    (SBLOCK_UFS2 - secsize) / dev_bsize, secsize) != 0) {
-		free(fsrbuf);
-		return (0);
-	}
-	fsr = (struct fsrecovery *)&fsrbuf[secsize - sizeof *fsr];
-	if (fsr->fsr_magic != FS_UFS2_MAGIC) {
-		free(fsrbuf);
-		return (0);
-	}
-	memset(fs, 0, sizeof(struct fs));
-	fs->fs_fpg = fsr->fsr_fpg;
-	fs->fs_fsbtodb = fsr->fsr_fsbtodb;
-	fs->fs_sblkno = fsr->fsr_sblkno;
-	fs->fs_magic = fsr->fsr_magic;
-	fs->fs_ncg = fsr->fsr_ncg;
-	free(fsrbuf);
-	return (1);
-}
-
-/*
  * Check to see if recovery information exists.
  * Return 1 if it exists or cannot be created.
  * Return 0 if it does not exist and can be created.
diff --git a/sbin/geom/Makefile b/sbin/geom/Makefile
index 078503d3ae67..61561ef1ff1b 100644
--- a/sbin/geom/Makefile
+++ b/sbin/geom/Makefile
@@ -9,7 +9,7 @@ MAN=		geom.8
 CFLAGS+=	-I${.CURDIR} -I${.CURDIR}/core
 CFLAGS+=	-DGEOM_CLASS_DIR=\"${GEOM_CLASS_DIR}\"
 
-LIBADD=		geom util
+LIBADD=		geom util xo
 
 .if defined(RESCUE)
 .PATH:	${SRCTOP}/lib/geom/part \
diff --git a/sbin/geom/core/geom.c b/sbin/geom/core/geom.c
index b78021194ddd..1a4f7e1f061a 100644
--- a/sbin/geom/core/geom.c
+++ b/sbin/geom/core/geom.c
@@ -49,9 +49,12 @@
 #include <assert.h>
 #include <libgeom.h>
 #include <geom.h>
+#include <libxo/xo.h>
 
 #include "misc/subr.h"
 
+#define GEOM_XO_VERSION "1"
+
 #ifdef STATIC_GEOM_CLASSES
 extern uint32_t gpart_version;
 extern struct g_command gpart_class_commands[];
@@ -513,6 +516,7 @@ run_command(int argc, char *argv[])
 	gctl_free(req);
 	if (verbose)
 		printf("Done.\n");
+	xo_finish();
 	exit(EXIT_SUCCESS);
 }
 
@@ -810,6 +814,10 @@ main(int argc, char *argv[])
 	provider_name = NULL;
 	tflag = false;
 
+	argc = xo_parse_args(argc, argv);
+	if (argc < 0)
+		return (argc);
+
 	if (strcmp(getprogname(), "geom") == 0) {
 		while ((ch = getopt(argc, argv, "hp:t")) != -1) {
 			switch (ch) {
@@ -831,6 +839,7 @@ main(int argc, char *argv[])
 		 * Don't adjust argc and argv, it would break get_class().
 		 */
 	}
+	xo_set_version(GEOM_XO_VERSION);
 
 	if (tflag && provider_name != NULL) {
 		errx(EXIT_FAILURE,
@@ -839,6 +848,7 @@ main(int argc, char *argv[])
 
 	if (provider_name != NULL) {
 		list_one_geom_by_provider(provider_name);
+		xo_finish();
 		return (0);
 	}
 
@@ -882,29 +892,33 @@ find_geom(struct gclass *classp, const char *name)
 }
 
 static void
-list_one_provider(struct gprovider *pp, const char *prefix)
+list_one_provider(struct gprovider *pp, const char *padding)
 {
 	struct gconfig *conf;
 	char buf[5];
 
-	printf("Name: %s\n", pp->lg_name);
+	xo_emit("{Lcw:Name}{:Name}\n", pp->lg_name);
 	humanize_number(buf, sizeof(buf), (int64_t)pp->lg_mediasize, "",
 	    HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL);
-	printf("%sMediasize: %jd (%s)\n", prefix, (intmax_t)pp->lg_mediasize,
-	    buf);
-	printf("%sSectorsize: %u\n", prefix, pp->lg_sectorsize);
+	xo_emit("{P:/%s}{Lcw:Mediasize}{:Mediasize/%jd} ({N:/%s})\n",
+	    padding, (intmax_t)pp->lg_mediasize, buf);
+	xo_emit("{P:/%s}{Lcw:Sectorsize}{:Sectorsize/%u} \n",
+	    padding, pp->lg_sectorsize);
 	if (pp->lg_stripesize > 0 || pp->lg_stripeoffset > 0) {
-		printf("%sStripesize: %ju\n", prefix, pp->lg_stripesize);
-		printf("%sStripeoffset: %ju\n", prefix, pp->lg_stripeoffset);
+		xo_emit("{P:/%s}{Lcw:Stripesize}{Stripesize/%ju}\n",
+		    padding, pp->lg_stripesize);
+		xo_emit("{P:/%s}{Lcw:Stripeoffset}{Stripeoffset/%ju}\n",
+		    padding, pp->lg_stripeoffset);
 	}
-	printf("%sMode: %s\n", prefix, pp->lg_mode);
+	xo_emit("{P:/%s}{Lcw:Mode}{Mode}\n", padding, pp->lg_mode);
 	LIST_FOREACH(conf, &pp->lg_config, lg_config) {
-		printf("%s%s: %s\n", prefix, conf->lg_name, conf->lg_val);
+		xo_emit("{P:/%s}{Lcwa:}{a:}\n", padding, conf->lg_name,
+		    conf->lg_name, conf->lg_val);
 	}
 }
 
 static void
-list_one_consumer(struct gconsumer *cp, const char *prefix)
+list_one_consumer(struct gconsumer *cp, const char *padding)
 {
 	struct gprovider *pp;
 	struct gconfig *conf;
@@ -915,20 +929,24 @@ list_one_consumer(struct gconsumer *cp, const char *prefix)
 	else {
 		char buf[5];
 
-		printf("Name: %s\n", pp->lg_name);
+		xo_emit("{Lcw:Name}{:Name}\n", pp->lg_name);
 		humanize_number(buf, sizeof(buf), (int64_t)pp->lg_mediasize, "",
 		    HN_AUTOSCALE, HN_B | HN_NOSPACE | HN_DECIMAL);
-		printf("%sMediasize: %jd (%s)\n", prefix,
-		    (intmax_t)pp->lg_mediasize, buf);
-		printf("%sSectorsize: %u\n", prefix, pp->lg_sectorsize);
+		xo_emit("{P:/%s}{Lcw:Mediasize}{:Mediasize/%jd} ({N:/%s})\n",
+		    padding, (intmax_t)pp->lg_mediasize, buf);
+		xo_emit("{P:/%s}{Lcw:Sectorsize}{:Sectorsize/%u}\n",
+		    padding, pp->lg_sectorsize);
 		if (pp->lg_stripesize > 0 || pp->lg_stripeoffset > 0) {
-			printf("%sStripesize: %ju\n", prefix, pp->lg_stripesize);
-			printf("%sStripeoffset: %ju\n", prefix, pp->lg_stripeoffset);
+			xo_emit("{P:/%s}{Lcw:Stripesize}{:Stripesize/%ju}\n",
+			    padding, pp->lg_stripesize);
+			xo_emit("{P:/%s}{Lcw:Stripeoffset}{:Stripesize/%ju}\n",
+			    padding, pp->lg_stripeoffset);
 		}
-		printf("%sMode: %s\n", prefix, cp->lg_mode);
+		xo_emit("{P:/%s}{Lcw:Mode}{:Mode}\n", padding, pp->lg_mode);
 	}
 	LIST_FOREACH(conf, &cp->lg_config, lg_config) {
-		printf("%s%s: %s\n", prefix, conf->lg_name, conf->lg_val);
+		xo_emit("{P:/%s}{Lcwa:}{a:}\n", padding, conf->lg_name,
+		    conf->lg_name, conf->lg_val);
 	}
 }
 
@@ -940,27 +958,36 @@ list_one_geom(struct ggeom *gp)
 	struct gconfig *conf;
 	unsigned n;
 
-	printf("Geom name: %s\n", gp->lg_name);
+	xo_emit("{Lcw:Geom name}{:Name}\n", gp->lg_name);
 	LIST_FOREACH(conf, &gp->lg_config, lg_config) {
-		printf("%s: %s\n", conf->lg_name, conf->lg_val);
+		xo_emit("{Lcwa:}{a:}\n", conf->lg_name, conf->lg_name,
+		    conf->lg_val);
 	}
 	if (!LIST_EMPTY(&gp->lg_provider)) {
-		printf("Providers:\n");
+		xo_open_list("Providers");
+		xo_emit("{Tc:Providers}\n");
 		n = 1;
 		LIST_FOREACH(pp, &gp->lg_provider, lg_provider) {
-			printf("%u. ", n++);
+			xo_emit("{T:/%u}. ", n++);
+			xo_open_instance("provider");
 			list_one_provider(pp, "   ");
+			xo_close_instance("provider");
 		}
+		xo_close_list("Providers");
 	}
 	if (!LIST_EMPTY(&gp->lg_consumer)) {
-		printf("Consumers:\n");
+		xo_open_list("Consumers");
+		xo_emit("{Tc:Consumers}\n");
 		n = 1;
 		LIST_FOREACH(cp, &gp->lg_consumer, lg_consumer) {
-			printf("%u. ", n++);
+			xo_emit("{T:/%u}. ", n++);
+			xo_open_instance("consumer");
 			list_one_consumer(cp, "   ");
+			xo_close_instance("consumer");
 		}
+		xo_close_list("Consumers");
 	}
-	printf("\n");
+	xo_emit("\n");
 }
 
 static void
@@ -978,8 +1005,10 @@ list_one_geom_by_provider(const char *provider_name)
 	if (gp == NULL)
 		errx(EXIT_FAILURE, "Cannot find provider '%s'.", provider_name);
 
-	printf("Geom class: %s\n", gp->lg_class->lg_name);
+	xo_open_container("Geom");
+	xo_emit("{Lwc:Geom class}{:Class}\n", gp->lg_class->lg_name);
 	list_one_geom(gp);
+	xo_close_container("Geom");
 }
 
 static void
@@ -1038,14 +1067,20 @@ std_list(struct gctl_req *req, unsigned flags __unused)
 				    "an instance named '%s'.",
 				    gclass_name, name);
 			}
+			xo_open_container("Geom");
 			list_one_geom(gp);
+			xo_close_container("Geom");
 		}
 	} else {
+		xo_open_list("Geoms");
 		LIST_FOREACH(gp, &classp->lg_geom, lg_geom) {
 			if (LIST_EMPTY(&gp->lg_provider) && !all)
 				continue;
+			xo_open_instance("geom");
 			list_one_geom(gp);
+			xo_close_instance("geom");
 		}
+		xo_close_list("Geoms");
 	}
 	geom_deletetree(&mesh);
 }
@@ -1115,34 +1150,24 @@ status_update_len_prs(struct ggeom *gp, int *name_len, int *status_len)
 }
 
 static char *
-status_one_consumer(struct gconsumer *cp)
+status_one_consumer(struct gconsumer *cp, const char *value)
 {
-	static char buf[256];
 	struct gprovider *pp;
 	struct gconfig *conf;
-	const char *state, *syncr;
+	char *ret;
 
 	pp = cp->lg_provider;
 	if (pp == NULL)
 		return (NULL);
-	state = NULL;
-	syncr = NULL;
+	ret = NULL;
 	LIST_FOREACH(conf, &cp->lg_config, lg_config) {
-		if (strcasecmp(conf->lg_name, "state") == 0)
-			state = conf->lg_val;
-		if (strcasecmp(conf->lg_name, "synchronized") == 0)
-			syncr = conf->lg_val;
-	}
-	if (state == NULL && syncr == NULL)
-		snprintf(buf, sizeof(buf), "%s", pp->lg_name);
-	else if (state != NULL && syncr != NULL) {
-		snprintf(buf, sizeof(buf), "%s (%s, %s)", pp->lg_name,
-		    state, syncr);
-	} else {
-		snprintf(buf, sizeof(buf), "%s (%s)", pp->lg_name,
-		    state ? state : syncr);
+		if (strcasecmp(conf->lg_name, value) == 0)
+			ret = conf->lg_val;
 	}
-	return (buf);
+
+	if (ret == NULL)
+		return (NULL);
+	return (ret);
 }
 
 static void
@@ -1150,8 +1175,8 @@ status_one_geom(struct ggeom *gp, int script, int name_len, int status_len)
 {
 	struct gconsumer *cp;
 	struct gconfig *conf;
-	const char *name, *status, *component;
-	int gotone;
+	const char *name, *status, *cstate, *csyncr;
+	int gotone, len;
 
 	name = gp->lg_name;
 	status = "N/A";
@@ -1161,21 +1186,49 @@ status_one_geom(struct ggeom *gp, int script, int name_len, int status_len)
 			break;
 		}
 	}
-	gotone = 0;
+	gotone = len = 0;
+	xo_open_instance("status");
 	LIST_FOREACH(cp, &gp->lg_consumer, lg_consumer) {
-		component = status_one_consumer(cp);
-		if (component == NULL)
+		cstate = status_one_consumer(cp, "state");
+		csyncr = status_one_consumer(cp, "synchronized");
+		if (cstate == NULL && csyncr == NULL)
 			continue;
+		if (!gotone || script) {
+			if (!gotone) {
+				xo_emit("{:name/%*s}  {:status/%*s}  ",
+				    name_len, name, status_len, status);
+			} else {
+				xo_emit("{d:name/%*s}  {d:status/%*s}  ",
+				    name_len, name, status_len, status);
+			}
+			xo_open_list("components");
+		}
+
+		xo_open_instance("components");
+		if (cstate != NULL && csyncr != NULL) {
+			xo_emit("{P:/%*s}{:compontent} ({:state}, {:synchronized})\n",
+			len, "", cp->lg_provider->lg_name, cstate, csyncr);
+		} else if (cstate != NULL) {
+			xo_emit("{P:/%*s}{:compontent} ({:state})\n",
+			len, "", cp->lg_provider->lg_name, cstate);
+		} else {
+			xo_emit("{P:/%*s}{:compontent} ({:synchronized})\n",
+			len, "", cp->lg_provider->lg_name, csyncr);
+		}
+		xo_close_instance("components");
 		gotone = 1;
-		printf("%*s  %*s  %s\n", name_len, name, status_len, status,
-		    component);
-		if (!script)
-			name = status = "";
+		if (!len && !script)
+			len = name_len + status_len + 4;
 	}
 	if (!gotone) {
-		printf("%*s  %*s  %s\n", name_len, name, status_len, status,
-		    "N/A");
+		xo_emit("{:name/%*s}  {:status/%*s}  ", name_len, name, status_len, status);
+		xo_open_list("components");
+		xo_open_instance("components");
+		xo_emit("{P:/%*s}{d:compontent}\n", len, "", "N/A");
+		xo_close_instance("components");
 	}
+	xo_close_list("components");
+	xo_close_instance("status");
 }
 
 static void
@@ -1184,9 +1237,10 @@ status_one_geom_prs(struct ggeom *gp, int script, int name_len, int status_len)
 	struct gprovider *pp;
 	struct gconsumer *cp;
 	struct gconfig *conf;
-	const char *name, *status, *component;
-	int gotone;
+	const char *name, *status, *cstate, *csyncr;
+	int gotone, len;
 
+	xo_open_instance("status");
 	LIST_FOREACH(pp, &gp->lg_provider, lg_provider) {
 		name = pp->lg_name;
 		status = "N/A";
@@ -1202,22 +1256,50 @@ status_one_geom_prs(struct ggeom *gp, int script, int name_len, int status_len)
 				break;
 			}
 		}
-		gotone = 0;
+		gotone = len = 0;
 		LIST_FOREACH(cp, &gp->lg_consumer, lg_consumer) {
-			component = status_one_consumer(cp);
-			if (component == NULL)
+			cstate = status_one_consumer(cp, "state");
+			csyncr = status_one_consumer(cp, "synchronized");
+			if (cstate == NULL && csyncr == NULL)
 				continue;
+
+			if (!gotone || script) {
+				if (!gotone) {
+					xo_emit("{:name/%*s}  {:status/%*s}  ",
+					    name_len, name, status_len, status);
+				} else {
+					xo_emit("{d:name/%*s}  {d:status/%*s}  ",
+					    name_len, name, status_len, status);
+				}
+				xo_open_list("components");
+			}
+
+			xo_open_instance("component");
+			if (cstate != NULL && csyncr != NULL) {
+				xo_emit("{P:/%*s}{:compontent} ({:state}, {:synchronized})\n",
+				len, "", cp->lg_provider->lg_name, cstate, csyncr);
+			} else if (cstate != NULL) {
+				xo_emit("{P:/%*s}{:compontent} ({:state})\n",
+				len, "", cp->lg_provider->lg_name, cstate);
+			} else {
+				xo_emit("{P:/%*s}{:compontent} ({:synchronized})\n",
+				len, "", cp->lg_provider->lg_name, csyncr);
+			}
+			xo_close_instance("component");
 			gotone = 1;
-			printf("%*s  %*s  %s\n", name_len, name,
-			    status_len, status, component);
-			if (!script)
-				name = status = "";
+			if (!len && !script)
+				len = name_len + status_len + 4;
 		}
 		if (!gotone) {
-			printf("%*s  %*s  %s\n", name_len, name,
-			    status_len, status, "N/A");
+			xo_emit("{:name/%*s}  {:status/%*s}  ", name_len, name, status_len, status);
+			xo_open_list("components");
+			xo_open_instance("components");
+			xo_emit("{P:/%*s}{d:compontent}\n", len, "", "N/A");
+			xo_close_instance("components");
 		}
+		xo_close_list("components");
 	}
+	xo_close_instance("status");
 }
 
 static void
@@ -1240,13 +1322,9 @@ std_status(struct gctl_req *req, unsigned flags __unused)
 	all = gctl_get_int(req, "all");
 	geoms = gctl_get_int(req, "geoms");
 	script = gctl_get_int(req, "script");
-	if (script) {
-		name_len = 0;
-		status_len = 0;
-	} else {
-		name_len = strlen("Name");
-		status_len = strlen("Status");
-	}
+	name_len = strlen("Name");
+	status_len = strlen("Status");
+
 	if (nargs > 0) {
 		for (i = 0, n = 0; i < nargs; i++) {
 			name = gctl_get_ascii(req, "arg%d", i);
@@ -1282,9 +1360,10 @@ std_status(struct gctl_req *req, unsigned flags __unused)
 			goto end;
 	}
 	if (!script) {
-		printf("%*s  %*s  %s\n", name_len, "Name", status_len, "Status",
-		    "Components");
+		xo_emit("{T:/%*s}  {T:/%*s}  {T:Components}\n",
+		    name_len, "Name", status_len, "Status");
 	}
+	xo_open_list("status");
 	if (nargs > 0) {
 		for (i = 0; i < nargs; i++) {
 			name = gctl_get_ascii(req, "arg%d", i);
@@ -1312,6 +1391,7 @@ std_status(struct gctl_req *req, unsigned flags __unused)
 			}
 		}
 	}
+	xo_close_list("status");
 end:
 	geom_deletetree(&mesh);
 }
diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8
index fafb77e1ca6c..d4f8d2b5747a 100644
--- a/sbin/ifconfig/ifconfig.8
+++ b/sbin/ifconfig/ifconfig.8
@@ -28,7 +28,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd September 12, 2025
+.Dd October 12, 2025
 .Dt IFCONFIG 8
 .Os
 .Sh NAME
@@ -2799,7 +2799,7 @@ Set the untagged VLAN identifier for an interface.
 Frames received on this interface without an 802.1Q tag will be assigned
 to this VLAN instead of the default VLAN 0,
 and outgoing frames on this VLAN will have their 802.1Q tag removed.
-.It Cm -ifuntagged Ar interface Ar vlan-id
+.It Cm -ifuntagged Ar interface
 Clear the untagged VLAN identifier for an interface.
 .It Cm defuntagged Ar vlan-id
 Enable the
diff --git a/sbin/ipfw/tables.c b/sbin/ipfw/tables.c
index 7c3b1bb35a01..245c0c9e0399 100644
--- a/sbin/ipfw/tables.c
+++ b/sbin/ipfw/tables.c
@@ -1037,9 +1037,6 @@ table_modify_record(ipfw_obj_header *oh, int ac, char *av[], int add,
 		}
 	}
 
-	/* Get real OS error */
-	error = errno;
-
 	/* Report results back */
 	ptent = tent_buf;
 	for (i = 0; i < count; ptent++, i++) {
diff --git a/sbin/mdconfig/tests/mdconfig_test.sh b/sbin/mdconfig/tests/mdconfig_test.sh
index ea87ff5d542d..cc29c188cbd8 100755
--- a/sbin/mdconfig/tests/mdconfig_test.sh
+++ b/sbin/mdconfig/tests/mdconfig_test.sh
@@ -274,22 +274,23 @@ attach_size_rounddown()
 attach_size_rounddown_body()
 {
 	local md
-	local ss=8192
-	local ms=$(($ss + 4096))
-	local ms2=$((2 * $ss + 4096))
+	local pgsz=$(pagesize)
+	local ss=$(($pgsz * 2))
+	local ms=$(($ss + $pgsz))
+	local ms2=$((2 * $ss + $pgsz))
 
-	# Use a sector size that's a likely multiple of PAGE_SIZE, as md(4)
+	# Use a sector size that's a multiple of the kernel page size, as md(4)
 	# expects that for swap MDs.
 	atf_check -s exit:0 -o save:mdconfig.out -e empty \
 	    -x "mdconfig -a -t swap -S $ss -s ${ms}b"
 	md=$(cat mdconfig.out)
-	# 12288 bytes should be rounded down to one sector.
-	check_diskinfo "$md" 8192 1 $ss
+	# one sector plus one page should be rounded down to one sector.
+	check_diskinfo "$md" $ss 1 $ss
 
 	# Resize and verify that the new size was also rounded down.
 	atf_check -s exit:0 -o empty -e empty \
 	    -x "mdconfig -r -u ${md#md} -s ${ms2}b"
-	check_diskinfo "$md" 16384 2 $ss
+	check_diskinfo "$md" $((2 * $ss)) 2 $ss
 }
 attach_size_rounddown_cleanup()
 {
diff --git a/sbin/mount_nullfs/mount_nullfs.8 b/sbin/mount_nullfs/mount_nullfs.8
index 17b1f45f5e42..b3cf57fd9dea 100644
--- a/sbin/mount_nullfs/mount_nullfs.8
+++ b/sbin/mount_nullfs/mount_nullfs.8
@@ -90,7 +90,7 @@ See the
 .Xr mount 8
 man page for possible options and their meanings.
 Additionally the following option is supported:
-.Bl -tag -width nocache
+.Bl -tag -width nounixbypass
 .It Cm nocache
 Disable metadata caching in the null layer.
 Some lower-layer file systems may force this option.
@@ -98,6 +98,32 @@ Depending on the access pattern,
 this may result in increased lock contention.
 .It Cm cache
 Force enable metadata caching.
+.It Cm nounixbypass
+Disable bypassing
+.Xr unix 4
+socket files used for
+.Xr bind 2
+and
+.Xr connect 2 ,
+to the lower (mounted-from) filesystem layer.
+.Pp
+The effect is that lower and upper (bypassed) unix sockets
+are separate.
+.It Cm unixbypass
+Enable the bypass of unix socket file to lower filesystem layer.
+This is default.
+.Pp
+The effect is that
+.Xr bind 2
+and
+.Xr connect 2
+operations on a unix socket done from either the upper (nullfs) or lower
+layer path are performed on same unix socket.
+For instance, if a server
+.Xr bind 2
+is done on a socket in the lower layer, then
+.Xr connect 2
+on the socket file accessed via the nullfs mount, connects to the server.
 .El
 .El
 .Pp
diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c
index 21562fa03e0d..ed317495c2e0 100644
--- a/sbin/pfctl/pfctl.c
+++ b/sbin/pfctl/pfctl.c
@@ -2183,6 +2183,7 @@ pfctl_load_rule(struct pfctl *pf, char *path, struct pfctl_rule *r, int depth)
 {
 	u_int8_t		rs_num = pf_get_ruleset_number(r->action);
 	char			*name;
+	uint32_t		ticket;
 	char			anchor[PF_ANCHOR_NAME_SIZE];
 	int			len = strlen(path);
 	int			error;
@@ -2192,7 +2193,9 @@ pfctl_load_rule(struct pfctl *pf, char *path, struct pfctl_rule *r, int depth)
 	if ((pf->opts & PF_OPT_NOACTION) == 0) {
 		if (pf->trans == NULL)
 			errx(1, "pfctl_load_rule: no transaction");
-		pf->anchor->ruleset.tticket = pfctl_get_ticket(pf->trans, rs_num, path);
+		ticket = pfctl_get_ticket(pf->trans, rs_num, path);
+		if (rs_num == PF_RULESET_FILTER)
+			 pf->anchor->ruleset.tticket = ticket;
 	}
 	if (strlcpy(anchor, path, sizeof(anchor)) >= sizeof(anchor))
 		errx(1, "pfctl_load_rule: strlcpy");
@@ -2225,7 +2228,7 @@ pfctl_load_rule(struct pfctl *pf, char *path, struct pfctl_rule *r, int depth)
 			return (1);
 		if (pfctl_add_pool(pf, &r->route, PF_RT))
 			return (1);
-		error = pfctl_add_rule_h(pf->h, r, anchor, name, pf->anchor->ruleset.tticket,
+		error = pfctl_add_rule_h(pf->h, r, anchor, name, ticket,
 		    pf->paddr.ticket);
 		switch (error) {
 		case 0:
@@ -3582,6 +3585,12 @@ main(int argc, char *argv[])
 	}
 
 	if (clearopt != NULL) {
+		int	 mnr;
+
+		/* Check if anchor exists. */
+		if ((pfctl_get_rulesets(pfh, anchorname, &mnr)) == ENOENT)
+			errx(1, "No such anchor %s", anchorname);
+
 		switch (*clearopt) {
 		case 'e':
 			pfctl_flush_eth_rules(dev, opts, anchorname);
diff --git a/sbin/ping/tests/Makefile b/sbin/ping/tests/Makefile
index 0520b1d634cf..7d3ab02b9a86 100644
--- a/sbin/ping/tests/Makefile
+++ b/sbin/ping/tests/Makefile
@@ -1,5 +1,6 @@
 ATF_TESTS_C+=	in_cksum_test
-SRCS.in_cksum_test= in_cksum_test.c ../utils.c
+.PATH:	${.CURDIR:H}
+SRCS.in_cksum_test= in_cksum_test.c utils.c
 
 PACKAGE= tests
 
diff --git a/sbin/rcorder/rcorder.c b/sbin/rcorder/rcorder.c
index 87b0e873c7ae..3d2a67c82a5a 100644
--- a/sbin/rcorder/rcorder.c
+++ b/sbin/rcorder/rcorder.c
@@ -980,9 +980,11 @@ do_file(filenode *fnode, strnodelist *stack_ptr)
 		fnode->last->next = fnode->next;
 	}
 
-	if (fnode->issues_count)
-		warnx("`%s' was seen in circular dependencies for %d times.",
-		    fnode->filename, fnode->issues_count);
+	if (fnode->issues_count) {
+		warnx("`%s' was seen in circular dependencies %d time%s.",
+		    fnode->filename, fnode->issues_count,
+		    fnode->issues_count > 1 ? "s" : "");
+	}
 
 	DPRINTF((stderr, "nuking %s\n", fnode->filename));
 }