3 files changed, 13 insertions, 13 deletions
diff --git a/libexec/fingerd/Makefile b/libexec/fingerd/Makefile
index 296cb504bab1..e2fe412df8bc 100644
--- a/libexec/fingerd/Makefile
+++ b/libexec/fingerd/Makefile
@@ -7,10 +7,10 @@ MAN=	fingerd.8
 WARNS?=	2
 WFORMAT=0
 
-.if ${MK_BLACKLIST_SUPPORT} != "no"
-CFLAGS+= -DUSE_BLACKLIST -I${SRCTOP}/contrib/blocklist/include
-LIBADD+= blacklist
-LDFLAGS+=-L${LIBBLACKLISTDIR}
+.if ${MK_BLOCKLIST_SUPPORT} != "no"
+CFLAGS+= -DUSE_BLOCKLIST -I${SRCTOP}/contrib/blocklist/include
+LIBADD+= blocklist
+LDFLAGS+=-L${LIBBLOCKLISTDIR}
 .endif
 
 .include <bsd.prog.mk>
diff --git a/libexec/fingerd/Makefile.depend.options b/libexec/fingerd/Makefile.depend.options
index 5a94eff626dc..f68343adae89 100644
--- a/libexec/fingerd/Makefile.depend.options
+++ b/libexec/fingerd/Makefile.depend.options
@@ -1,5 +1,5 @@
 # This file is not autogenerated - take care!
 
-DIRDEPS_OPTIONS= BLACKLIST_SUPPORT
+DIRDEPS_OPTIONS= BLOCKLIST_SUPPORT
 
 .include <dirdeps-options.mk>
diff --git a/libexec/fingerd/fingerd.c b/libexec/fingerd/fingerd.c
index c30d5e5e0ef5..8b63aa338b0c 100644
--- a/libexec/fingerd/fingerd.c
+++ b/libexec/fingerd/fingerd.c
@@ -45,8 +45,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include "pathnames.h"
-#ifdef USE_BLACKLIST
-#include <blacklist.h>
+#ifdef USE_BLOCKLIST
+#include <blocklist.h>
 #endif
 
 void logerr(const char *, ...) __printflike(1, 2) __dead2;
@@ -144,8 +144,8 @@ main(int argc, char *argv[])
 		*ap = strtok(lp, " \t\r\n");
 		if (!*ap) {
 			if (secure && ap == &av[4]) {
-#ifdef USE_BLACKLIST
-				blacklist(1, STDIN_FILENO, "nousername");
+#ifdef USE_BLOCKLIST
+				blocklist(1, STDIN_FILENO, "nousername");
 #endif
 				puts("must provide username\r\n");
 				exit(1);
@@ -153,8 +153,8 @@ main(int argc, char *argv[])
 			break;
 		}
 		if (secure && strchr(*ap, '@')) {
-#ifdef USE_BLACKLIST
-			blacklist(1, STDIN_FILENO, "noforwarding");
+#ifdef USE_BLOCKLIST
+			blocklist(1, STDIN_FILENO, "noforwarding");
 #endif
 			puts("forwarding service denied\r\n");
 			exit(1);
@@ -194,8 +194,8 @@ main(int argc, char *argv[])
 		}
 		dup2(STDOUT_FILENO, STDERR_FILENO);
 
-#ifdef USE_BLACKLIST
-		blacklist(0, STDIN_FILENO, "success");
+#ifdef USE_BLOCKLIST
+		blocklist(0, STDIN_FILENO, "success");
 #endif
 		execv(prog, comp);
 		write(STDERR_FILENO, prog, strlen(prog));