From 19b1775311ba2c4683037b70facd1f3ab87a80bb Mon Sep 17 00:00:00 2001 From: Jose Luis Duran Date: Sat, 28 Mar 2026 02:09:34 +0000 Subject: [PATCH] Rename blacklist to blocklist Current versions of NetBSD and FreeBSD are using the new nomenclature. --- MANIFEST | 2 +- Makefile.global.in | 10 +++--- ci/test | 2 +- configure.ac | 4 +-- doc/pod/hacking.pod | 2 +- doc/pod/install.pod | 14 ++++----- doc/pod/news.pod | 6 ++-- doc/pod/nnrpd.pod | 20 ++++++------ m4/blacklist.m4 | 76 --------------------------------------------- m4/blocklist.m4 | 76 +++++++++++++++++++++++++++++++++++++++++++++ nnrpd/Makefile | 4 +-- nnrpd/nnrpd.c | 16 +++++----- nnrpd/nnrpd.h | 2 +- nnrpd/perm.c | 40 ++++++++++++------------ support/mksnapshot | 2 +- 15 files changed, 138 insertions(+), 138 deletions(-) delete mode 100644 m4/blacklist.m4 create mode 100644 m4/blocklist.m4 diff --git a/MANIFEST b/MANIFEST index 4b48f9027..094b0a020 100644 --- a/MANIFEST +++ b/MANIFEST @@ -600,7 +600,7 @@ lib/xwrite.c write that handles partial transfers m4 Autoconf support macros (Directory) m4/aux-libs.m4 Autoconf macro for extra libraries m4/bdb.m4 Autoconf macros for Berkeley DB -m4/blacklist.m4 Autoconf macros for blacklistd (BSD OS) +m4/blocklist.m4 Autoconf macros for blocklistd (BSD OS) m4/canlock.m4 Autoconf macros for Cancel-Lock support m4/cc-c-o.m4 Autoconf macro for -c -o compiler support m4/cc-flags.m4 Autoconf macro for compiler flags diff --git a/Makefile.global.in b/Makefile.global.in index de32b86e3..d4dbe5de4 100644 --- a/Makefile.global.in +++ b/Makefile.global.in @@ -162,12 +162,12 @@ CANLOCK_CPPFLAGS= @CANLOCK_CPPFLAGS@ CANLOCK_LDFLAGS = @CANLOCK_LDFLAGS@ CANLOCK_LIBS = $(abs_builddir)/lib/canlock$(LIBSUFFIX).o @CANLOCK_LIBS@ -## blacklistd support. Additional flags and libraries needed to add support -## for FreeBSD's and NetBSD's blacklistd daemon. +## blocklistd support. Additional flags and libraries needed to add support +## for FreeBSD's and NetBSD's blocklistd daemon. -BLACKLIST_CPPFLAGS = @BLACKLIST_CPPFLAGS@ -BLACKLIST_LDFLAGS = @BLACKLIST_LDFLAGS@ -BLACKLIST_LIBS = @BLACKLIST_LIBS@ +BLOCKLIST_CPPFLAGS = @BLOCKLIST_CPPFLAGS@ +BLOCKLIST_LDFLAGS = @BLOCKLIST_LDFLAGS@ +BLOCKLIST_LIBS = @BLOCKLIST_LIBS@ ## Missing functions. If non-empty, configure detected that your system ## was missing some standard functions, and INN will be providing its own diff --git a/ci/test b/ci/test index 1ca6b34c0..3239d4d8c 100755 --- a/ci/test +++ b/ci/test @@ -32,7 +32,7 @@ make test # Test --enable-keywords and disabling optional dependencies. make distclean ./configure CC="$COMPILER" --enable-keywords --without-bdb \ - --without-blacklist --without-canlock --without-krb5 --without-openssl \ + --without-blocklist --without-canlock --without-krb5 --without-openssl \ --without-sasl --without-sqlite3 --without-zlib make warnings make test diff --git a/configure.ac b/configure.ac index 901df0d6e..71e200277 100644 --- a/configure.ac +++ b/configure.ac @@ -132,7 +132,7 @@ m4_define_default([AM_CONDITIONAL], [:]) dnl Lots of our macros are stored in separate files for ease of maintenance. m4_include([m4/aux-libs.m4]) m4_include([m4/bdb.m4]) -m4_include([m4/blacklist.m4]) +m4_include([m4/blocklist.m4]) m4_include([m4/canlock.m4]) m4_include([m4/cc-c-o.m4]) m4_include([m4/cc-flags.m4]) @@ -543,7 +543,7 @@ fi dnl Handle optional libraries and probing for their locations and component dnl libraries if needed. INN_LIB_BDB_OPTIONAL -INN_LIB_BLACKLIST_OPTIONAL +INN_LIB_BLOCKLIST_OPTIONAL INN_LIB_CANLOCK_OPTIONAL INN_LIB_KRB5_OPTIONAL INN_LIB_OPENSSL_OPTIONAL diff --git a/doc/pod/hacking.pod b/doc/pod/hacking.pod index ac71faf0d..555640705 100644 --- a/doc/pod/hacking.pod +++ b/doc/pod/hacking.pod @@ -719,7 +719,7 @@ B<--enable-tagged-hash>, B<--enable-keywords>, B<--enable-largefiles> and B<--enable-reduced-depends>). Ideally, ensure INN builds fine with the latest versions of external libraries -it has support for (S, blacklistd, Cyrus SASL, libcanlock, +it has support for (S, blocklistd, Cyrus SASL, libcanlock, LibreSSL, MIT S, OpenSSL, Perl, Python, SQLite, zlib). =item 4. diff --git a/doc/pod/install.pod b/doc/pod/install.pod index c6ed446d5..3bdb3b46d 100644 --- a/doc/pod/install.pod +++ b/doc/pod/install.pod @@ -179,7 +179,7 @@ of configure options enabling optional features and the software and versions you'll need: --with-bdb Berkeley DB 4.4 or higher, 4.7+ recommended - --with-blacklist blacklistd from FreeBSD 11 or higher base system + --with-blocklist blocklistd from FreeBSD 11 or higher base system --with-canlock libcanlock 3.3.0 or higher --with-krb5 MIT Kerberos v5 1.6.1 or higher --with-openssl OpenSSL 1.1.1 or higher, 3.0.0+ recommended @@ -542,18 +542,18 @@ If the libcanlock library is found at configure time, INN will be built with Cancel-Lock support unless the B<--without-canlock> flag is explicitly passed to C. -=item B<--with-blacklist>=PATH +=item B<--with-blocklist>=PATH -Enables B integration with FreeBSD's or NetBSD's blacklistd(8) -for blocking of brute force attacks. blacklistd and its client library -libblacklist have been available in the FreeBSD base system since S integration with FreeBSD's or NetBSD's blocklistd(8) +for blocking of brute force attacks. blocklistd and its client library +libblocklist have been available in the FreeBSD base system since S and should be automatically detected if PATH is not given. They have also been in the NetBSD base system since S. For this feature to have any effect, B needs to be started with the -B<-B> flag, and blacklistd needs to be configured and running. See the +B<-B> flag, and blocklistd needs to be configured and running. See the B documentation for a short configuration snippet and/or read the -blacklistd(8) documentation. +blocklistd(8) documentation. =back diff --git a/doc/pod/news.pod b/doc/pod/news.pod index 7a1ae656e..0b79fc558 100644 --- a/doc/pod/news.pod +++ b/doc/pod/news.pod @@ -671,12 +671,12 @@ inn.conf> in case you're passing that flag to B). =item * -Andreas Kempe has implemented blacklistd support in B. This daemon, +Andreas Kempe has implemented blocklistd support in B. This daemon, available notably in FreeBSD and NetBSD, can be used to prevent brute force attacks by blocking attackers after a number of failed login attempts. When B is run with the new B<-B> flag, and INN has been configured -with the new B<--with-blacklist> option, it will report login attempts to the -blacklistd daemon for potential blocking. +with the new B<--with-blocklist> option, it will report login attempts to the +blocklistd daemon for potential blocking. =item * diff --git a/doc/pod/nnrpd.pod b/doc/pod/nnrpd.pod index e53de25c1..3131b0cfc 100644 --- a/doc/pod/nnrpd.pod +++ b/doc/pod/nnrpd.pod @@ -80,11 +80,11 @@ Similar to the B<-4> flag. B<-b> is kept for backward compatibility. =item B<-B> -If specified, B will report login attempts to blacklistd(8) +If specified, B will report login attempts to blocklistd(8) for automatic blocking after a number of failed attempts. To use this -flag, the blacklist library must have been found at configure time, or -B<--with-blacklist> specified at configure time. For more information, see -L below. +flag, the blocklist library must have been found at configure time, or +B<--with-blocklist> specified at configure time. For more information, see +L below. =item B<-c> I @@ -288,21 +288,21 @@ I parameters in F to fine-tune the behaviour of the TLS/SSL negotiation whenever a new attack on the TLS protocol or some supported cipher suite is discovered. -=head1 BLACKLISTD SUPPORT +=head1 BLOCKLISTD SUPPORT -blacklistd(8) is a FreeBSD/NetBSD daemon for preventing brute force attacks by +blocklistd(8) is a FreeBSD/NetBSD daemon for preventing brute force attacks by blocking attackers after a number of failed login attempts. When B is -built with blacklistd support, it will report login attempts to the blacklistd +built with blocklistd support, it will report login attempts to the blocklistd daemon for potential blocking. -Adding the configuration below to F under the C<[local]> +Adding the configuration below to F under the C<[local]> section, assuming B is listening on port 563, would lead to attackers being blocked for 10 minutes after 5 failed login attempts. # adr/mask:port type proto owner name nfail disable 563 stream * * * 5 10m -See the blacklistd(8) documentation for more information. +See the blocklistd(8) documentation for more information. =head1 PROTOCOL DIFFERENCES @@ -384,7 +384,7 @@ Febuary 1998. =head1 SEE ALSO -blacklistd(8), ctlinnd(8), innd(8), inn.conf(5), inn-secrets.conf(5), +blocklistd(8), ctlinnd(8), innd(8), inn.conf(5), inn-secrets.conf(5), libinn_uwildmat(3), nnrpd.track(5), passwd.nntp(5), readers.conf(5), signal(2). diff --git a/m4/blacklist.m4 b/m4/blacklist.m4 deleted file mode 100644 index 07b4dd89a..000000000 --- a/m4/blacklist.m4 +++ /dev/null @@ -1,76 +0,0 @@ -dnl Find the compiler and linker flags for the blacklist library on FreeBSD -dnl which integrates with the blacklistd daemon. -dnl -dnl Finds the compiler and linker flags for linking with the blacklist library. -dnl Provides the --with-blacklist, --with-blacklist-lib, and -dnl --with-blacklist-include configure options to specify non-standard -dnl paths to the blacklist library. -dnl -dnl Provides the macro INN_LIB_BLACKLIST and sets the substitution variables -dnl BLACKLIST_CPPFLAGS, BLACKLIST_LDFLAGS, and BLACKLIST_LIBS. Also provides -dnl INN_LIB_BLACKLIST_SWITCH to set CPPFLAGS, LDFLAGS, and LIBS to include the -dnl blacklist library, saving the current values first, and -dnl INN_LIB_BLACKLIST_RESTORE to restore those settings to before the last -dnl INN_LIB_BLACKLIST_SWITCH. Defines HAVE_BLACKLIST and sets -dnl inn_use_BLACKLIST to true. -dnl -dnl Provides the INN_LIB_BLACKLIST_OPTIONAL macro, which should be used if -dnl blacklist support is optional. This macro will still always set the -dnl substitution variables, but they'll be empty if libblacklist is not found -dnl or if --without-blacklist is given. Defines HAVE_BLACKLIST and sets -dnl inn_use_BLACKLIST to true if the blacklist library is found and -dnl --without-blacklist is not given. -dnl -dnl Depends on the lib-helper.m4 framework. -dnl -dnl Written in 2022 by Andreas Kempe for the InterNetNews (INN) news server -dnl -dnl This file is free software; the authors give unlimited permission to copy -dnl and/or distribute it, with or without modifications, as long as this -dnl notice is preserved. -dnl -dnl SPDX-License-Identifier: FSFULLR - -dnl Save the current CPPFLAGS, LDFLAGS, and LIBS settings and switch to -dnl versions that include the blacklist flags. Used as a wrapper, with -dnl INN_LIB_BLACKLIST_RESTORE, around tests. -AC_DEFUN([INN_LIB_BLACKLIST_SWITCH], [INN_LIB_HELPER_SWITCH([BLACKLIST])]) - -dnl Restore CPPFLAGS, LDFLAGS, and LIBS to their previous values (before -dnl INN_LIB_BLACKLIST_SWITCH was called). -AC_DEFUN([INN_LIB_BLACKLIST_RESTORE], [INN_LIB_HELPER_RESTORE([BLACKLIST])]) - -dnl Checks if the blacklist library is present. The single argument, if -dnl "true", says to fail if the blacklist library could not be found. -AC_DEFUN([_INN_LIB_BLACKLIST_INTERNAL], -[INN_LIB_HELPER_PATHS([BLACKLIST]) - INN_LIB_BLACKLIST_SWITCH - AC_CHECK_HEADER([blacklist.h], - [AC_CHECK_LIB([blacklist], [blacklist_r], - [BLACKLIST_LIBS="-lblacklist"], - [AS_IF([test x"$1" = xtrue], - [AC_MSG_ERROR([cannot find usable blacklist library])])])], - [AS_IF([test x"$1" = xtrue], - [AC_MSG_ERROR([cannot find usable blacklist header])])]) - INN_LIB_BLACKLIST_RESTORE]) - -dnl The main macro for packages with mandatory blacklist support. -AC_DEFUN([INN_LIB_BLACKLIST], -[INN_LIB_HELPER_VAR_INIT([BLACKLIST]) - INN_LIB_HELPER_WITH([blacklist], [blacklist], [BLACKLIST]) - _INN_LIB_BLACKLIST_INTERNAL([true]) - inn_use_BLACKLIST=true - AC_DEFINE([HAVE_BLACKLIST], 1, [Define if libblacklist is available.])]) - -dnl The main macro for packages with optional blacklist support. -AC_DEFUN([INN_LIB_BLACKLIST_OPTIONAL], -[INN_LIB_HELPER_VAR_INIT([BLACKLIST]) - INN_LIB_HELPER_WITH_OPTIONAL([blacklist], [blacklist], [BLACKLIST]) - AS_IF([test x"$inn_use_BLACKLIST" != xfalse], - [AS_IF([test x"$inn_use_BLACKLIST" = xtrue], - [_INN_LIB_BLACKLIST_INTERNAL([true])], - [_INN_LIB_BLACKLIST_INTERNAL([false])])]) - AS_IF([test x"$BLACKLIST_LIBS" = x], - [INN_LIB_HELPER_VAR_CLEAR([BLACKLIST])], - [inn_use_BLACKLIST=true - AC_DEFINE([HAVE_BLACKLIST], 1, [Define if libblacklist is available.])])]) diff --git a/m4/blocklist.m4 b/m4/blocklist.m4 new file mode 100644 index 000000000..cd4b7bd72 --- /dev/null +++ b/m4/blocklist.m4 @@ -0,0 +1,76 @@ +dnl Find the compiler and linker flags for the blocklist library on FreeBSD +dnl which integrates with the blocklistd daemon. +dnl +dnl Finds the compiler and linker flags for linking with the blocklist library. +dnl Provides the --with-blocklist, --with-blocklist-lib, and +dnl --with-blocklist-include configure options to specify non-standard +dnl paths to the blocklist library. +dnl +dnl Provides the macro INN_LIB_BLOCKLIST and sets the substitution variables +dnl BLOCKLIST_CPPFLAGS, BLOCKLIST_LDFLAGS, and BLOCKLIST_LIBS. Also provides +dnl INN_LIB_BLOCKLIST_SWITCH to set CPPFLAGS, LDFLAGS, and LIBS to include the +dnl blocklist library, saving the current values first, and +dnl INN_LIB_BLOCKLIST_RESTORE to restore those settings to before the last +dnl INN_LIB_BLOCKLIST_SWITCH. Defines HAVE_BLOCKLIST and sets +dnl inn_use_BLOCKLIST to true. +dnl +dnl Provides the INN_LIB_BLOCKLIST_OPTIONAL macro, which should be used if +dnl blocklist support is optional. This macro will still always set the +dnl substitution variables, but they'll be empty if libblocklist is not found +dnl or if --without-blocklist is given. Defines HAVE_BLOCKLIST and sets +dnl inn_use_BLOCKLIST to true if the blocklist library is found and +dnl --without-blocklist is not given. +dnl +dnl Depends on the lib-helper.m4 framework. +dnl +dnl Written in 2022 by Andreas Kempe for the InterNetNews (INN) news server +dnl +dnl This file is free software; the authors give unlimited permission to copy +dnl and/or distribute it, with or without modifications, as long as this +dnl notice is preserved. +dnl +dnl SPDX-License-Identifier: FSFULLR + +dnl Save the current CPPFLAGS, LDFLAGS, and LIBS settings and switch to +dnl versions that include the blocklist flags. Used as a wrapper, with +dnl INN_LIB_BLOCKLIST_RESTORE, around tests. +AC_DEFUN([INN_LIB_BLOCKLIST_SWITCH], [INN_LIB_HELPER_SWITCH([BLOCKLIST])]) + +dnl Restore CPPFLAGS, LDFLAGS, and LIBS to their previous values (before +dnl INN_LIB_BLOCKLIST_SWITCH was called). +AC_DEFUN([INN_LIB_BLOCKLIST_RESTORE], [INN_LIB_HELPER_RESTORE([BLOCKLIST])]) + +dnl Checks if the blocklist library is present. The single argument, if +dnl "true", says to fail if the blocklist library could not be found. +AC_DEFUN([_INN_LIB_BLOCKLIST_INTERNAL], +[INN_LIB_HELPER_PATHS([BLOCKLIST]) + INN_LIB_BLOCKLIST_SWITCH + AC_CHECK_HEADER([blocklist.h], + [AC_CHECK_LIB([blocklist], [blocklist_r], + [BLOCKLIST_LIBS="-lblocklist"], + [AS_IF([test x"$1" = xtrue], + [AC_MSG_ERROR([cannot find usable blocklist library])])])], + [AS_IF([test x"$1" = xtrue], + [AC_MSG_ERROR([cannot find usable blocklist header])])]) + INN_LIB_BLOCKLIST_RESTORE]) + +dnl The main macro for packages with mandatory blocklist support. +AC_DEFUN([INN_LIB_BLOCKLIST], +[INN_LIB_HELPER_VAR_INIT([BLOCKLIST]) + INN_LIB_HELPER_WITH([blocklist], [blocklist], [BLOCKLIST]) + _INN_LIB_BLOCKLIST_INTERNAL([true]) + inn_use_BLOCKLIST=true + AC_DEFINE([HAVE_BLOCKLIST], 1, [Define if libblocklist is available.])]) + +dnl The main macro for packages with optional blocklist support. +AC_DEFUN([INN_LIB_BLOCKLIST_OPTIONAL], +[INN_LIB_HELPER_VAR_INIT([BLOCKLIST]) + INN_LIB_HELPER_WITH_OPTIONAL([blocklist], [blocklist], [BLOCKLIST]) + AS_IF([test x"$inn_use_BLOCKLIST" != xfalse], + [AS_IF([test x"$inn_use_BLOCKLIST" = xtrue], + [_INN_LIB_BLOCKLIST_INTERNAL([true])], + [_INN_LIB_BLOCKLIST_INTERNAL([false])])]) + AS_IF([test x"$BLOCKLIST_LIBS" = x], + [INN_LIB_HELPER_VAR_CLEAR([BLOCKLIST])], + [inn_use_BLOCKLIST=true + AC_DEFINE([HAVE_BLOCKLIST], 1, [Define if libblocklist is available.])])]) diff --git a/nnrpd/Makefile b/nnrpd/Makefile index a630a7c1f..0226c4edd 100644 --- a/nnrpd/Makefile +++ b/nnrpd/Makefile @@ -2,7 +2,7 @@ include ../Makefile.global top = .. CFLAGS = $(GCFLAGS) $(SSL_CPPFLAGS) $(SASL_CPPFLAGS) $(ZLIB_CPPFLAGS) \ - $(BLACKLIST_CPPFLAGS) + $(BLOCKLIST_CPPFLAGS) ALL = nnrpd @@ -36,7 +36,7 @@ NNRPDLIBS = $(LIBSTORAGE) $(LIBHIST) $(LIBINN) $(STORAGE_LIBS) \ $(SSL_LDFLAGS) $(SSL_LIBS) \ $(CRYPTO_LIBS) $(SASL_LDFLAGS) $(SASL_LIBS) \ $(ZLIB_LDFLAGS) $(ZLIB_LIBS) \ - $(BLACKLIST_LDFLAGS) $(BLACKLIST_LIBS) \ + $(BLOCKLIST_LDFLAGS) $(BLOCKLIST_LIBS) \ $(PERL_LIBS) $(PYTHON_LIBS) \ $(LIBS) diff --git a/nnrpd/nnrpd.c b/nnrpd/nnrpd.c index e68932571..6532a1533 100644 --- a/nnrpd/nnrpd.c +++ b/nnrpd/nnrpd.c @@ -51,10 +51,10 @@ bool encryption_layer_on = false; #endif /* Optional arguments for getopt. */ -#if defined(HAVE_BLACKLIST) -# define BLACKLIST_OPT "B" +#if defined(HAVE_BLOCKLIST) +# define BLOCKLIST_OPT "B" #else -# define BLACKLIST_OPT "" +# define BLOCKLIST_OPT "" #endif #if defined(HAVE_OPENSSL) @@ -1033,7 +1033,7 @@ main(int argc, char *argv[]) #endif /* HAVE_SASL */ while ((i = getopt(argc, argv, - "4:6:b:" BLACKLIST_OPT "c:Dfi:I:nop:P:r:s:" OPENSSL_OPT + "4:6:b:" BLOCKLIST_OPT "c:Dfi:I:nop:P:r:s:" OPENSSL_OPT "t")) != EOF) switch (i) { @@ -1049,11 +1049,11 @@ main(int argc, char *argv[]) case '6': /* Bind to a certain IPv6 address. */ ListenAddr6 = xstrdup(optarg); break; -#if defined(HAVE_BLACKLIST) - case 'B': /* Enable blacklistd functionality. */ - BlacklistEnabled = true; +#if defined(HAVE_BLOCKLIST) + case 'B': /* Enable blocklistd functionality. */ + BlocklistEnabled = true; break; -#endif /* HAVE_BLACKLIST */ +#endif /* HAVE_BLOCKLIST */ case 'c': /* Use alternate readers.conf. */ ConfFile = concatpath(innconf->pathetc, optarg); break; diff --git a/nnrpd/nnrpd.h b/nnrpd/nnrpd.h index 1e956e07b..00e82166b 100644 --- a/nnrpd/nnrpd.h +++ b/nnrpd/nnrpd.h @@ -181,7 +181,7 @@ EXTERN ACCESSGROUP *PERMaccessconf; EXTERN bool Tracing; EXTERN bool Offlinepost; EXTERN bool initialSSL; -EXTERN bool BlacklistEnabled; +EXTERN bool BlocklistEnabled; EXTERN bool hasSentCapabilities; EXTERN char **PERMreadlist; EXTERN char **PERMpostlist; diff --git a/nnrpd/perm.c b/nnrpd/perm.c index 63e52aa14..0b4b57a9b 100644 --- a/nnrpd/perm.c +++ b/nnrpd/perm.c @@ -9,14 +9,14 @@ #include #include -#if defined(HAVE_BLACKLIST) -# include +#if defined(HAVE_BLOCKLIST) +# include # include /* Some systems (like NetBSD 9.2) do not define these pretty names. */ -# ifndef BLACKLIST_API_ENUM +# ifndef BLOCKLIST_API_ENUM enum { - BLACKLIST_AUTH_OK = 0, - BLACKLIST_AUTH_FAIL + BLOCKLIST_AUTH_OK = 0, + BLOCKLIST_AUTH_FAIL }; # endif #endif @@ -95,8 +95,8 @@ static void GrowArray(void *, void *); static void PERMvectortoaccess(ACCESSGROUP *acc, const char *name, struct vector *acccess_vec) UNUSED; -#if defined(HAVE_BLACKLIST) -static void BlacklistReport(const char *user); +#if defined(HAVE_BLOCKLIST) +static void BlocklistReport(const char *user); #endif /* Global variables. */ @@ -1640,8 +1640,8 @@ PERMlogin(char *uname, char *pass, int *code, char *errorstr) while (runame == NULL && i-- > 0) runame = AuthenticateUser(auth_realms[i], uname, pass, code, errorstr); -#if defined(HAVE_BLACKLIST) - BlacklistReport(runame); +#if defined(HAVE_BLOCKLIST) + BlocklistReport(runame); #endif if (runame != NULL) { @@ -2250,38 +2250,38 @@ AuthenticateUser(AUTHGROUP *auth, char *username, char *password, } -#if defined(HAVE_BLACKLIST) +#if defined(HAVE_BLOCKLIST) void -BlacklistReport(const char *user) +BlocklistReport(const char *user) { int ret; - struct blacklist *cookie; + struct blocklist *cookie; /* Only try reporting if nnrpd is started with -B. */ - if (!BlacklistEnabled) + if (!BlocklistEnabled) return; /* One nnrpd process only handles one login attempt. Connect to - * blacklistd, report and disconnect to avoid keeping the blacklistd + * blocklistd, report and disconnect to avoid keeping the blocklistd * connection open and unused. */ - cookie = blacklist_open(); + cookie = blocklist_open(); if (cookie == NULL) { - syslog(L_ERROR, "could not connect to blacklistd: %s", + syslog(L_ERROR, "could not connect to blocklistd: %s", strerror(errno)); return; } /* nnrpd always uses STDIN for client input. */ if (user != NULL) - ret = blacklist_r(cookie, BLACKLIST_AUTH_OK, STDIN_FILENO, + ret = blocklist_r(cookie, BLOCKLIST_AUTH_OK, STDIN_FILENO, "login successful"); else - ret = blacklist_r(cookie, BLACKLIST_AUTH_FAIL, STDIN_FILENO, + ret = blocklist_r(cookie, BLOCKLIST_AUTH_FAIL, STDIN_FILENO, "login failed"); if (ret == -1) - syslog(L_ERROR, "blacklistd communication failed: %s", + syslog(L_ERROR, "blocklistd communication failed: %s", strerror(errno)); - blacklist_close(cookie); + blocklist_close(cookie); } #endif diff --git a/support/mksnapshot b/support/mksnapshot index 3b46d66ef..702582832 100755 --- a/support/mksnapshot +++ b/support/mksnapshot @@ -87,7 +87,7 @@ else # Run yet another build, with other configure options. # This one is without features requiring external libraries. make distclean - ./configure --enable-keywords --without-bdb --without-blacklist \ + ./configure --enable-keywords --without-bdb --without-blocklist \ --without-canlock --without-krb5 --without-openssl --without-sasl \ --without-sqlite3 --without-zlib make warnings