From 179bcf67ed0b9724499004ff8a70eb68462807c1 Mon Sep 17 00:00:00 2001
From: florian <florian@openbsd.org>
Date: Sun, 3 Aug 2025 13:20:36 +0000
Subject: [PATCH] Disable "status memory" command.

About a year ago we had to disable the shared cache for the different
resolver strategies because it led to a segfault in unwind after a
libunbound update. There are no more memory statistics to show at this
point. I am still hopeful to bring the feature back one day, so hide
the command behind a ifdef like we did in resolver.c.

Missing feature reported by Jordan Geoghegan on bugs@
---
 usr.sbin/unwindctl/parser.c    | 4 +++-
 usr.sbin/unwindctl/unwindctl.8 | 8 ++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/usr.sbin/unwindctl/parser.c b/usr.sbin/unwindctl/parser.c
index 4cd38865ab6..97b6ce80fec 100644
--- a/usr.sbin/unwindctl/parser.c
+++ b/usr.sbin/unwindctl/parser.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: parser.c,v 1.11 2019/12/18 09:18:28 florian Exp $	*/
+/*	$OpenBSD: parser.c,v 1.12 2025/08/03 13:20:36 florian Exp $	*/
 
 /*
  * Copyright (c) 2004 Esben Norby <norby@openbsd.org>
@@ -69,7 +69,9 @@ static const struct token t_log[] = {
 static const struct token t_status[] = {
 	{NOTOKEN,	"",		NONE,		NULL},
 	{KEYWORD,	"autoconf",	AUTOCONF,	NULL},
+#ifdef UNIFIED_CACHE
 	{KEYWORD,	"memory",	MEM,		NULL},
+#endif /* UNIFIED_CACHE */
 	{ENDTOKEN,	"",		NONE,		NULL}
 };
 
diff --git a/usr.sbin/unwindctl/unwindctl.8 b/usr.sbin/unwindctl/unwindctl.8
index 7d5b934dff3..f9d70b34191 100644
--- a/usr.sbin/unwindctl/unwindctl.8
+++ b/usr.sbin/unwindctl/unwindctl.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: unwindctl.8,v 1.13 2023/01/03 20:58:05 deraadt Exp $
+.\"	$OpenBSD: unwindctl.8,v 1.14 2025/08/03 13:20:36 florian Exp $
 .\"
 .\" Copyright (c) 2004, 2005 Esben Norby <norby@openbsd.org>
 .\"
@@ -14,7 +14,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: January 3 2023 $
+.Dd $Mdocdate: August 3 2025 $
 .Dt UNWINDCTL 8
 .Os
 .Sh NAME
@@ -60,8 +60,8 @@ Show nameservers learned from
 .Xr dhcpleased 8
 or
 .Xr slaacd 8 .
-.It Cm status memory
-Show memory consumption.
+.\" .It Cm status memory
+.\" Show memory consumption.
 .El
 .Sh FILES
 .Bl -tag -width "/dev/unwind.sockXX" -compact