Date: Fri, 28 Aug 2020 01:55:35 +0000 (UTC) From: Rick Macklem <rmacklem@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r364898 - in projects/nfs-over-tls: rc.d usr.sbin/rpctlscd usr.sbin/rpctlssd Message-ID: <202008280155.07S1tZRH015137@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rmacklem Date: Fri Aug 28 01:55:35 2020 New Revision: 364898 URL: https://svnweb.freebsd.org/changeset/base/364898 Log: Add code to rpctlscd.c and rpctlssd.c to load "aesni". This replaces the code in the rc.d scripts, which caused the scripts to fail if "aesni" could not be loaded. Loading "aesni" may not be necessary for the cases where TLS has net interface hardware support, but I do not know how to check for that and loading aesni.ko seems harmless. Modified: projects/nfs-over-tls/rc.d/rpctlscd projects/nfs-over-tls/rc.d/rpctlssd projects/nfs-over-tls/usr.sbin/rpctlscd/rpctlscd.c projects/nfs-over-tls/usr.sbin/rpctlssd/rpctlssd.c Modified: projects/nfs-over-tls/rc.d/rpctlscd ============================================================================== --- projects/nfs-over-tls/rc.d/rpctlscd Fri Aug 28 00:00:37 2020 (r364897) +++ projects/nfs-over-tls/rc.d/rpctlscd Fri Aug 28 01:55:35 2020 (r364898) @@ -14,13 +14,6 @@ desc="NFS over TLS client side daemon" rcvar="rpctlscd_enable" command="/usr/sbin/${name}" pidfile="/var/run/${name}.pid" -start_precmd="rpctlscd_precmd" - -rpctlscd_precmd() -{ - # If this load fails, TLS should still work, just more slowly. - kldload -n -q aesni.ko -} load_rc_config $name Modified: projects/nfs-over-tls/rc.d/rpctlssd ============================================================================== --- projects/nfs-over-tls/rc.d/rpctlssd Fri Aug 28 00:00:37 2020 (r364897) +++ projects/nfs-over-tls/rc.d/rpctlssd Fri Aug 28 01:55:35 2020 (r364898) @@ -16,13 +16,6 @@ command="/usr/sbin/${name}" pidfile="/var/run/${name}.pid" required_files="/etc/rpctlssd/cert.pem /etc/rpctlssd/key.pem" extra_commands="reload" -start_precmd="rpctlssd_precmd" - -rpctlssd_precmd() -{ - # If this load fails, TLS should still work, just more slowly. - kldload -n -q aesni.ko -} load_rc_config $name Modified: projects/nfs-over-tls/usr.sbin/rpctlscd/rpctlscd.c ============================================================================== --- projects/nfs-over-tls/usr.sbin/rpctlscd/rpctlscd.c Fri Aug 28 00:00:37 2020 (r364897) +++ projects/nfs-over-tls/usr.sbin/rpctlscd/rpctlscd.c Fri Aug 28 01:55:35 2020 (r364898) @@ -144,6 +144,10 @@ main(int argc, char **argv) if (kldload("ktls_ocf") < 0 || modfind("ktls_ocf") < 0) errx(1, "Cannot load ktls_ocf"); } + if (modfind("aesni") < 0) { + /* Not present in kernel, try loading it */ + kldload("aesni"); + } /* Get the time when this daemon is started. */ gettimeofday(&tm, &tz); Modified: projects/nfs-over-tls/usr.sbin/rpctlssd/rpctlssd.c ============================================================================== --- projects/nfs-over-tls/usr.sbin/rpctlssd/rpctlssd.c Fri Aug 28 00:00:37 2020 (r364897) +++ projects/nfs-over-tls/usr.sbin/rpctlssd/rpctlssd.c Fri Aug 28 01:55:35 2020 (r364898) @@ -156,6 +156,10 @@ main(int argc, char **argv) if (kldload("ktls_ocf") < 0 || modfind("ktls_ocf") < 0) errx(1, "Cannot load ktls_ocf"); } + if (modfind("aesni") < 0) { + /* Not present in kernel, try loading it */ + kldload("aesni"); + } /* Get the time when this daemon is started. */ gettimeofday(&tm, &tz);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202008280155.07S1tZRH015137>