git: 1271b1d747a7 - main - rc.d: remove obsolete /etc/rc.d/keyserv
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 03 May 2025 15:47:32 UTC
The branch main has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=1271b1d747a7746a858e793cda8e78c150c79e01 commit 1271b1d747a7746a858e793cda8e78c150c79e01 Author: Lexi Winter <ivy@FreeBSD.org> AuthorDate: 2025-05-03 15:44:03 +0000 Commit: Lexi Winter <ivy@FreeBSD.org> CommitDate: 2025-05-03 15:44:03 +0000 rc.d: remove obsolete /etc/rc.d/keyserv the keyserv daemon was removed in 9dcb984251b3. also remove its rc script. Reviewed by: kevans, adrian, emaste Approved by: kevans (mentor) Fixes: 9dcb984251b3 ("Remove publickey(5) stuff") Differential Revision: https://reviews.freebsd.org/D50135 --- ObsoleteFiles.inc | 1 + libexec/rc/rc.d/Makefile | 5 +---- libexec/rc/rc.d/keyserv | 28 ---------------------------- 3 files changed, 2 insertions(+), 32 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index b5432dae3824..52cb219c6e89 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -102,6 +102,7 @@ OLD_FILES+=usr/share/man/man1/keylogin.1.gz OLD_FILES+=usr/share/man/man1/keylogin.1.gz OLD_FILES+=usr/share/man/man5/publickey.5.gz OLD_FILES+=usr/share/man/man8/keyserv.1.gz +OLD_FILES+=etc/rc.d/keyserv # 20241206: Remove Altera DE4 drivers OLD_FILES+=usr/share/man/man4/altera_atse.4.gz diff --git a/libexec/rc/rc.d/Makefile b/libexec/rc/rc.d/Makefile index 6e2e9d30ef79..122c52be3da8 100644 --- a/libexec/rc/rc.d/Makefile +++ b/libexec/rc/rc.d/Makefile @@ -290,13 +290,10 @@ NTPPACKAGE= ntp _opensm= opensm .endif -.if ${MK_OPENSSL} != "no" -CONFS+= keyserv -.if ${MK_OPENSSL_KTLS} != "no" +.if ${MK_OPENSSL} != "no" && ${MK_OPENSSL_KTLS} != "no" CONFS+= tlsclntd \ tlsservd .endif -.endif .if ${MK_OPENSSH} != "no" CONFGROUPS+= SSH diff --git a/libexec/rc/rc.d/keyserv b/libexec/rc/rc.d/keyserv deleted file mode 100755 index d78695eb33b2..000000000000 --- a/libexec/rc/rc.d/keyserv +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# -# - -# Start keyserv if we are running Secure RPC - -# PROVIDE: keyserv -# REQUIRE: ypset -# BEFORE: DAEMON -# KEYWORD: shutdown - -. /etc/rc.subr - -name="keyserv" -desc="Server for storing private encryption keys" -rcvar="keyserv_enable" -command="/usr/sbin/${name}" -start_precmd="keyserv_prestart" - -: ${keyserv_svcj_options:="net_basic"} - -keyserv_prestart() -{ - force_depend rpcbind || return 1 -} - -load_rc_config $name -run_rc_command "$1"