blocklist: Rename blacklist to blocklist

Follow up upstream rename from blacklist to blocklist.

- Old names and rc scripts are still valid, but emitting an ugly warning
- Old firewall rules and anchor names should work, but emitting an ugly
  warning
- Old MK_BLACKLIST* knobs are wired to the new ones

Although care has been taken not to break current configurations, this
is a large patch containing mostly duplicated code.  If issues arise, it
will be swiftly reverted.

Reviewed by:	ivy (pkgbase)
Approved by:	emaste (mentor)
MFC after:	2 days
Relnotes:	yes

(cherry picked from commit 7238317403b95a8e35cf0bc7cd66fbd78ecbe521)

1 files changed, 4 insertions, 4 deletions

diff --git a/crypto/openssh/monitor.c b/crypto/openssh/monitor.c
index b826ecdb9065..77dccf0d84f1 100644
--- a/crypto/openssh/monitor.c
+++ b/crypto/openssh/monitor.c
@@ -85,7 +85,7 @@
 #include "misc.h"
 #include "servconf.h"
 #include "monitor.h"
-#include "blacklist_client.h"
+#include "blocklist_client.h"
 
 #ifdef GSSAPI
 #include "ssh-gss.h"
@@ -355,7 +355,7 @@ monitor_child_preauth(struct ssh *ssh, struct monitor *pmonitor)
 			}
 		}
 		if (authctxt->failures > options.max_authtries) {
-			BLACKLIST_NOTIFY(ssh, BLACKLIST_AUTH_FAIL,
+			BLOCKLIST_NOTIFY(ssh, BLOCKLIST_AUTH_FAIL,
 			    "Too many authentication attempts");
 			/* Shouldn't happen */
 			fatal_f("privsep child made too many authentication "
@@ -364,12 +364,12 @@ monitor_child_preauth(struct ssh *ssh, struct monitor *pmonitor)
 	}
 
 	if (!authctxt->valid) {
-		BLACKLIST_NOTIFY(ssh, BLACKLIST_AUTH_FAIL,
+		BLOCKLIST_NOTIFY(ssh, BLOCKLIST_AUTH_FAIL,
 		    "Authenticated invalid user");
 		fatal_f("authenticated invalid user");
 	}
 	if (strcmp(auth_method, "unknown") == 0) {
-		BLACKLIST_NOTIFY(ssh, BLACKLIST_AUTH_FAIL,
+		BLOCKLIST_NOTIFY(ssh, BLOCKLIST_AUTH_FAIL,
 		    "Authentication method name unknown");
 		fatal_f("authentication method name unknown");
 	}