svn commit: r360832 - in projects/nfs-over-tls/usr.sbin: rpctlscd rpctlssd

[Rick Macklem]

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;