From d8eaf8b5dfb3fa583668dbad8b3fa8d5e109ad71 Mon Sep 17 00:00:00 2001 From: Enji Cooper Date: Tue, 23 Sep 2014 22:07:08 +0000 Subject: [PATCH] Don't install /etc/rc.d/keyserv unless MK_OPENSSL == yes Sponsored by: EMC / Isilon Storage Division --- etc/rc.d/Makefile | 5 ++++- tools/build/mk/OptionalObsoleteFiles.inc | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile index 186c9743d66..12c87db584c 100644 --- a/etc/rc.d/Makefile +++ b/etc/rc.d/Makefile @@ -72,7 +72,6 @@ FILES= DAEMON \ jail \ kadmind \ kdc \ - keyserv \ kfd \ kld \ kldxref \ @@ -186,6 +185,10 @@ _nscd= nscd _opensm= opensm .endif +.if ${MK_OPENSSL} != "no" +FILES+= keyserv +.endif + .if ${MK_OPENSSH} != "no" _sshd= sshd .endif diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 67b132c1d62..a12775b8b08 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -3510,9 +3510,9 @@ OLD_FILES+=usr/libexec/ssh-pkcs11-helper OLD_FILES+=usr/sbin/sshd .endif -#.if ${MK_OPENSSL} == no -# to be filled in -#.endif +.if ${MK_OPENSSL} == no +OLD_FILES+=etc/rc.d/keyserv +.endif .if ${MK_PC_SYSINSTALL} == no # backend-partmanager