The branch main has been updated by des:
URL:
https://cgit.FreeBSD.org/src/commit/?id=c989e3cc3da1bfd8ac3ec5a05d1e86ab8ff719f7
commit c989e3cc3da1bfd8ac3ec5a05d1e86ab8ff719f7
Author: Dag-Erling Smørgrav <d...@freebsd.org>
AuthorDate: 2025-08-13 22:38:52 +0000
Commit: Dag-Erling Smørgrav <d...@freebsd.org>
CommitDate: 2025-08-13 22:39:21 +0000
certctl: Fix bootstrap build
Fixes: 81d8827ad875 ("certctl: Reimplement in C")
---
usr.sbin/certctl/Makefile | 4 ++++
usr.sbin/certctl/certctl.c | 7 ++++++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/usr.sbin/certctl/Makefile b/usr.sbin/certctl/Makefile
index 5430dbf24853..6900f0ce3b65 100644
--- a/usr.sbin/certctl/Makefile
+++ b/usr.sbin/certctl/Makefile
@@ -7,4 +7,8 @@ LIBADD= crypto
HAS_TESTS=
SUBDIR.${MK_TESTS}= tests
+.ifdef BOOTSTRAPPING
+CFLAGS+=-DBOOTSTRAPPING
+.endif
+
.include <bsd.prog.mk>
diff --git a/usr.sbin/certctl/certctl.c b/usr.sbin/certctl/certctl.c
index 6687e56f23b4..365870167aeb 100644
--- a/usr.sbin/certctl/certctl.c
+++ b/usr.sbin/certctl/certctl.c
@@ -387,7 +387,12 @@ write_certs(const char *dir, struct cert_tree *tree)
* Open and scan the directory.
*/
if ((d = open(dir, O_DIRECTORY | O_RDONLY)) < 0 ||
- (ndents = fdscandir(d, &dents, NULL, lexisort)) < 0)
+#ifdef BOOTSTRAPPING
+ (ndents = scandir(dir, &dents, NULL, lexisort))
+#else
+ (ndents = fdscandir(d, &dents, NULL, lexisort))
+#endif
+ < 0)
err(1, "%s", dir);
/*
* Iterate over the directory listing and the certificate listing
