Date: Sat, 9 May 2020 01:48:08 +0000 (UTC) From: Rick Macklem <rmacklem@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r360832 - in projects/nfs-over-tls/usr.sbin: rpctlscd rpctlssd Message-ID: <202005090148.0491m88i017610@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rmacklem Date: Sat May 9 01:48:08 2020 New Revision: 360832 URL: https://svnweb.freebsd.org/changeset/base/360832 Log: Make both rpctlssd and rpctlscd load the ktls_ocf module, as required. Modified: projects/nfs-over-tls/usr.sbin/rpctlscd/rpctlscd.c projects/nfs-over-tls/usr.sbin/rpctlssd/rpctlssd.c Modified: projects/nfs-over-tls/usr.sbin/rpctlscd/rpctlscd.c ============================================================================== --- projects/nfs-over-tls/usr.sbin/rpctlscd/rpctlscd.c Sat May 9 01:34:43 2020 (r360831) +++ projects/nfs-over-tls/usr.sbin/rpctlscd/rpctlscd.c Sat May 9 01:48:08 2020 (r360832) @@ -141,6 +141,12 @@ main(int argc, char **argv) warn("cannot open or create pidfile"); } + if (modfind("ktls_ocf") < 0) { + /* Not present in kernel, try loading it */ + if (kldload("ktls_ocf") < 0 || modfind("ktls_ocf") < 0) + errx(1, "Cannot load ktls_ocf"); + } + /* Get the time when this daemon is started. */ gettimeofday(&tm, &tz); rpctls_ssl_sec = tm.tv_sec; Modified: projects/nfs-over-tls/usr.sbin/rpctlssd/rpctlssd.c ============================================================================== --- projects/nfs-over-tls/usr.sbin/rpctlssd/rpctlssd.c Sat May 9 01:34:43 2020 (r360831) +++ projects/nfs-over-tls/usr.sbin/rpctlssd/rpctlssd.c Sat May 9 01:48:08 2020 (r360832) @@ -153,6 +153,12 @@ main(int argc, char **argv) warn("cannot open or create pidfile"); } + if (modfind("ktls_ocf") < 0) { + /* Not present in kernel, try loading it */ + if (kldload("ktls_ocf") < 0 || modfind("ktls_ocf") < 0) + errx(1, "Cannot load ktls_ocf"); + } + /* Get the time when this daemon is started. */ gettimeofday(&tm, &tz); rpctls_ssl_sec = tm.tv_sec;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005090148.0491m88i017610>