The branch main has been updated by cy: URL: https://cgit.FreeBSD.org/src/commit/?id=2804461adfc670c78c1dcb9cab6b2191c8d486ec
commit 2804461adfc670c78c1dcb9cab6b2191c8d486ec Author: Cy Schubert <[email protected]> AuthorDate: 2025-12-19 04:59:38 +0000 Commit: Cy Schubert <[email protected]> CommitDate: 2025-12-19 12:54:11 +0000 ntp: Fix buildworld with MK_OPENSSL=no Reported by: wosch Tested by: wosch MFC after: 1 week --- usr.sbin/ntp/Makefile.inc | 2 +- usr.sbin/ntp/config.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/usr.sbin/ntp/Makefile.inc b/usr.sbin/ntp/Makefile.inc index 5801d91aac46..85340a5a9eea 100644 --- a/usr.sbin/ntp/Makefile.inc +++ b/usr.sbin/ntp/Makefile.inc @@ -9,7 +9,7 @@ NTPDEFS= -DSYS_FREEBSD CFLAGS+= ${NTPDEFS} ${DEFS_LOCAL} ${CLOCKDEFS} .if ${MK_OPENSSL} != "no" -CFLAGS+= -DOPENSSL -DAUTOKEY +CFLAGS+= -DOPENSSL -DAUTOKEY -DUSE_OPENSSL_CRYPTO_RAND .endif WARNS?= 0 diff --git a/usr.sbin/ntp/config.h b/usr.sbin/ntp/config.h index 3d6a1364dd10..6b0ef0b6ae6a 100644 --- a/usr.sbin/ntp/config.h +++ b/usr.sbin/ntp/config.h @@ -1664,7 +1664,8 @@ typedef unsigned int uintptr_t; #define USE_FSETOWNCTTY 1 /* Use OpenSSL's crypto random functions */ -#define USE_OPENSSL_CRYPTO_RAND 1 +/* We define this in Makefile.inc instead */ +/* #undef USE_OPENSSL_CRYPTO_RAND */ /* OK to use snprintb()? */ /* #undef USE_SNPRINTB */
