Merge remote-tracking branch 'ophion/upstream/dnsbl-rename'

charybdis-ircd · Jul 9, 2020 · ac09f70 · ac09f70
2 parents 860d238 + bc89b78
commit ac09f70
Show file tree

Hide file tree

Showing 13 changed files with 243 additions and 235 deletions.
diff --git a/authd/Makefile.am b/authd/Makefile.am
@@ -12,7 +12,7 @@ authd_SOURCES =	\
 	res.c \
 	reslib.c \
 	reslist.c \
-	providers/blacklist.c \
+	providers/dnsbl.c \
 	providers/ident.c \
 	providers/rdns.c \
 	providers/opm.c

diff --git a/authd/provider.c b/authd/provider.c
@@ -19,7 +19,7 @@
  */
 
 /* The basic design here is to have "authentication providers" that do things
- * like query ident and blacklists and even open proxies.
+ * like query ident and DNSBLs and even open proxies.
  *
  * Providers are registered in the auth_providers linked list. It is planned to
  * use a bitmap to store provider ID's later.
@@ -93,10 +93,10 @@ init_providers(void)
 	timeout_ev = rb_event_addish("provider_timeout_event", provider_timeout_event, NULL, 1);
 
 	/* FIXME must be started before rdns/ident to receive completion notification from them */
-	load_provider(&blacklist_provider);
+	load_provider(&dnsbl_provider);
 	load_provider(&opm_provider);
 
-	/* FIXME must be started after blacklist/opm in case of early completion notifications */
+	/* FIXME must be started after dnsbl/opm in case of early completion notifications */
 	load_provider(&rdns_provider);
 	load_provider(&ident_provider);
 }

diff --git a/authd/provider.h b/authd/provider.h
@@ -105,7 +105,7 @@ struct auth_provider
 
 extern struct auth_provider rdns_provider;
 extern struct auth_provider ident_provider;
-extern struct auth_provider blacklist_provider;
+extern struct auth_provider dnsbl_provider;
 extern struct auth_provider opm_provider;
 
 extern rb_dlink_list auth_providers;