Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/external/bsd/blocklist missed the capitalized ones.
details: https://anonhg.NetBSD.org/src/rev/2ccf45cbabdf
branches: trunk
changeset: 972993:2ccf45cbabdf
user: christos <christos%NetBSD.org@localhost>
date: Mon Jun 15 02:29:44 2020 +0000
description:
missed the capitalized ones.
diffstat:
external/bsd/blocklist/Makefile.inc | 4 ++--
external/bsd/blocklist/bin/blocklistctl.8 | 4 ++--
external/bsd/blocklist/bin/blocklistd.8 | 4 ++--
external/bsd/blocklist/bin/blocklistd.conf.5 | 4 ++--
external/bsd/blocklist/diff/ftpd.diff | 2 +-
external/bsd/blocklist/diff/named.diff | 2 +-
external/bsd/blocklist/diff/postfix.diff | 2 +-
external/bsd/blocklist/diff/proftpd.diff | 8 ++++----
external/bsd/blocklist/diff/ssh.diff | 2 +-
external/bsd/blocklist/include/blocklist.h | 18 +++++++++---------
external/bsd/blocklist/lib/blocklist.c | 12 ++++++------
external/bsd/blocklist/lib/libblocklist.3 | 16 ++++++++--------
12 files changed, 39 insertions(+), 39 deletions(-)
diffs (284 lines):
diff -r c545a781c8d8 -r 2ccf45cbabdf external/bsd/blocklist/Makefile.inc
--- a/external/bsd/blocklist/Makefile.inc Mon Jun 15 01:57:29 2020 +0000
+++ b/external/bsd/blocklist/Makefile.inc Mon Jun 15 02:29:44 2020 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.1.1.1 2020/06/15 01:52:52 christos Exp $
+# $NetBSD: Makefile.inc,v 1.2 2020/06/15 02:29:44 christos Exp $
WARNS=6
.if !defined(LIB)
LDADD+= -lblocklist
-DPADD+= ${LIBBLACKLIST}
+DPADD+= ${LIBBLOCKLIST}
.endif
CPPFLAGS+= -I${.CURDIR}/../include
CPPFLAGS+=-DHAVE_STRUCT_SOCKADDR_SA_LEN -DHAVE_UTIL_H -DHAVE_DB_H
diff -r c545a781c8d8 -r 2ccf45cbabdf external/bsd/blocklist/bin/blocklistctl.8
--- a/external/bsd/blocklist/bin/blocklistctl.8 Mon Jun 15 01:57:29 2020 +0000
+++ b/external/bsd/blocklist/bin/blocklistctl.8 Mon Jun 15 02:29:44 2020 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: blocklistctl.8,v 1.1.1.1 2020/06/15 01:52:52 christos Exp $
+.\" $NetBSD: blocklistctl.8,v 1.2 2020/06/15 02:29:44 christos Exp $
.\"
.\" Copyright (c) 2015 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -28,7 +28,7 @@
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
.Dd June 7, 2016
-.Dt BLACKLISTCTL 8
+.Dt BLOCKLISTCTL 8
.Os
.Sh NAME
.Nm blocklistctl
diff -r c545a781c8d8 -r 2ccf45cbabdf external/bsd/blocklist/bin/blocklistd.8
--- a/external/bsd/blocklist/bin/blocklistd.8 Mon Jun 15 01:57:29 2020 +0000
+++ b/external/bsd/blocklist/bin/blocklistd.8 Mon Jun 15 02:29:44 2020 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: blocklistd.8,v 1.1.1.1 2020/06/15 01:52:53 christos Exp $
+.\" $NetBSD: blocklistd.8,v 1.2 2020/06/15 02:29:44 christos Exp $
.\"
.\" Copyright (c) 2015 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -28,7 +28,7 @@
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
.Dd April 21, 2020
-.Dt BLACKLISTD 8
+.Dt BLOCKLISTD 8
.Os
.Sh NAME
.Nm blocklistd
diff -r c545a781c8d8 -r 2ccf45cbabdf external/bsd/blocklist/bin/blocklistd.conf.5
--- a/external/bsd/blocklist/bin/blocklistd.conf.5 Mon Jun 15 01:57:29 2020 +0000
+++ b/external/bsd/blocklist/bin/blocklistd.conf.5 Mon Jun 15 02:29:44 2020 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: blocklistd.conf.5,v 1.1.1.1 2020/06/15 01:52:53 christos Exp $
+.\" $NetBSD: blocklistd.conf.5,v 1.2 2020/06/15 02:29:44 christos Exp $
.\"
.\" Copyright (c) 2015 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -28,7 +28,7 @@
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
.Dd May 18, 2020
-.Dt BLACKLISTD.CONF 5
+.Dt BLOCKLISTD.CONF 5
.Os
.Sh NAME
.Nm blocklistd.conf
diff -r c545a781c8d8 -r 2ccf45cbabdf external/bsd/blocklist/diff/ftpd.diff
--- a/external/bsd/blocklist/diff/ftpd.diff Mon Jun 15 01:57:29 2020 +0000
+++ b/external/bsd/blocklist/diff/ftpd.diff Mon Jun 15 02:29:44 2020 +0000
@@ -43,7 +43,7 @@
+SRCS+= pfilter.c
+LDADD+= -lblocklist
-+DPADD+= ${LIBBLACKLIST}
++DPADD+= ${LIBBLOCKLIST}
+
.if defined(NO_INTERNAL_LS)
CPPFLAGS+=-DNO_INTERNAL_LS
diff -r c545a781c8d8 -r 2ccf45cbabdf external/bsd/blocklist/diff/named.diff
--- a/external/bsd/blocklist/diff/named.diff Mon Jun 15 01:57:29 2020 +0000
+++ b/external/bsd/blocklist/diff/named.diff Mon Jun 15 02:29:44 2020 +0000
@@ -64,7 +64,7 @@
update.c xfrout.c zoneconf.c ${SRCS_UNIX}
+LDADD+=-lblocklist
-+DPADD+=${LIBBLACKLIST}
++DPADD+=${LIBBLOCKLIST}
.include <bsd.prog.mk>
Index: dist/bin/named/client.c
===================================================================
diff -r c545a781c8d8 -r 2ccf45cbabdf external/bsd/blocklist/diff/postfix.diff
--- a/external/bsd/blocklist/diff/postfix.diff Mon Jun 15 01:57:29 2020 +0000
+++ b/external/bsd/blocklist/diff/postfix.diff Mon Jun 15 02:29:44 2020 +0000
@@ -74,7 +74,7 @@
DPADD+= ${LIBPMASTER} ${LIBPMILTER} ${LIBPGLOBAL} ${LIBPDNS} ${LIBPXSASL}
LDADD+= ${LIBPMASTER} ${LIBPMILTER} ${LIBPGLOBAL} ${LIBPDNS} ${LIBPXSASL}
-+DPADD+= ${LIBBLACKLIST}
++DPADD+= ${LIBBLOCKLIST}
+LDADD+= -lblocklist
+
DPADD+= ${LIBPTLS} ${LIBSSL} ${LIBCRYPTO}
diff -r c545a781c8d8 -r 2ccf45cbabdf external/bsd/blocklist/diff/proftpd.diff
--- a/external/bsd/blocklist/diff/proftpd.diff Mon Jun 15 01:57:29 2020 +0000
+++ b/external/bsd/blocklist/diff/proftpd.diff Mon Jun 15 02:29:44 2020 +0000
@@ -5,7 +5,7 @@
FTPWHO_OBJS=ftpwho.o scoreboard.o misc.o
BUILD_FTPWHO_OBJS=utils/ftpwho.o utils/scoreboard.o utils/misc.o
+
-+CPPFLAGS+=-DHAVE_BLACKLIST
++CPPFLAGS+=-DHAVE_BLOCKLIST
+LIBS+=-lblocklist
+OBJS+= pfilter.o
+BUILD_OBJS+= src/pfilter.o
@@ -84,7 +84,7 @@
+#include "pfilter.h"
+#include "conf.h"
+#include "privs.h"
-+#ifdef HAVE_BLACKLIST
++#ifdef HAVE_BLOCKLIST
+#include <blocklist.h>
+#endif
+
@@ -93,7 +93,7 @@
+void
+pfilter_init(void)
+{
-+#ifdef HAVE_BLACKLIST
++#ifdef HAVE_BLOCKLIST
+ if (blstate == NULL)
+ blstate = blocklist_open();
+#endif
@@ -102,7 +102,7 @@
+void
+pfilter_notify(int a)
+{
-+#ifdef HAVE_BLACKLIST
++#ifdef HAVE_BLOCKLIST
+ conn_t *c = session.c;
+ int fd;
+
diff -r c545a781c8d8 -r 2ccf45cbabdf external/bsd/blocklist/diff/ssh.diff
--- a/external/bsd/blocklist/diff/ssh.diff Mon Jun 15 01:57:29 2020 +0000
+++ b/external/bsd/blocklist/diff/ssh.diff Mon Jun 15 02:29:44 2020 +0000
@@ -61,7 +61,7 @@
DPADD+= ${LIBWRAP}
+
+LDADD+= -lblocklist
-+DPADD+= ${LIBBLACKLIST}
++DPADD+= ${LIBBLOCKLIST}
diff -ru openssh-7.7p1/auth-pam.c dist/auth-pam.c
--- openssh-7.7p1/auth-pam.c 2018-04-02 01:38:28.000000000 -0400
+++ dist/auth-pam.c 2018-05-23 11:56:22.206661484 -0400
diff -r c545a781c8d8 -r 2ccf45cbabdf external/bsd/blocklist/include/blocklist.h
--- a/external/bsd/blocklist/include/blocklist.h Mon Jun 15 01:57:29 2020 +0000
+++ b/external/bsd/blocklist/include/blocklist.h Mon Jun 15 02:29:44 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: blocklist.h,v 1.1.1.1 2020/06/15 01:52:53 christos Exp $ */
+/* $NetBSD: blocklist.h,v 1.2 2020/06/15 02:29:45 christos Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -28,8 +28,8 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef _BLACKLIST_H
-#define _BLACKLIST_H
+#ifndef _BLOCKLIST_H
+#define _BLOCKLIST_H
#include <sys/socket.h>
@@ -44,12 +44,12 @@
__END_DECLS
/* action values for user applications */
-#define BLACKLIST_API_ENUM 1
+#define BLOCKLIST_API_ENUM 1
enum {
- BLACKLIST_AUTH_OK = 0,
- BLACKLIST_AUTH_FAIL,
- BLACKLIST_ABUSIVE_BEHAVIOR,
- BLACKLIST_BAD_USER
+ BLOCKLIST_AUTH_OK = 0,
+ BLOCKLIST_AUTH_FAIL,
+ BLOCKLIST_ABUSIVE_BEHAVIOR,
+ BLOCKLIST_BAD_USER
};
-#endif /* _BLACKLIST_H */
+#endif /* _BLOCKLIST_H */
diff -r c545a781c8d8 -r 2ccf45cbabdf external/bsd/blocklist/lib/blocklist.c
--- a/external/bsd/blocklist/lib/blocklist.c Mon Jun 15 01:57:29 2020 +0000
+++ b/external/bsd/blocklist/lib/blocklist.c Mon Jun 15 02:29:44 2020 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: blocklist.c,v 1.1.1.1 2020/06/15 01:52:53 christos Exp $ */
+/* $NetBSD: blocklist.c,v 1.2 2020/06/15 02:29:45 christos Exp $ */
/*-
* Copyright (c) 2014 The NetBSD Foundation, Inc.
@@ -33,7 +33,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: blocklist.c,v 1.1.1.1 2020/06/15 01:52:53 christos Exp $");
+__RCSID("$NetBSD: blocklist.c,v 1.2 2020/06/15 02:29:45 christos Exp $");
#include <stdio.h>
#include <bl.h>
@@ -65,16 +65,16 @@
/* internal values are not the same as user application values */
switch (action) {
- case BLACKLIST_AUTH_FAIL:
+ case BLOCKLIST_AUTH_FAIL:
internal_action = BL_ADD;
break;
- case BLACKLIST_AUTH_OK:
+ case BLOCKLIST_AUTH_OK:
internal_action = BL_DELETE;
break;
- case BLACKLIST_ABUSIVE_BEHAVIOR:
+ case BLOCKLIST_ABUSIVE_BEHAVIOR:
internal_action = BL_ABUSE;
break;
- case BLACKLIST_BAD_USER:
+ case BLOCKLIST_BAD_USER:
internal_action = BL_BADUSER;
break;
default:
diff -r c545a781c8d8 -r 2ccf45cbabdf external/bsd/blocklist/lib/libblocklist.3
--- a/external/bsd/blocklist/lib/libblocklist.3 Mon Jun 15 01:57:29 2020 +0000
+++ b/external/bsd/blocklist/lib/libblocklist.3 Mon Jun 15 02:29:44 2020 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: libblocklist.3,v 1.1.1.1 2020/06/15 01:52:53 christos Exp $
+.\" $NetBSD: libblocklist.3,v 1.2 2020/06/15 02:29:45 christos Exp $
.\"
.\" Copyright (c) 2015 The NetBSD Foundation, Inc.
.\" All rights reserved.
@@ -28,7 +28,7 @@
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
.Dd March 30, 2020
-.Dt LIBBLACKLIST 3
+.Dt LIBBLOCKLIST 3
.Os
.Sh NAME
.Nm blocklist_open ,
@@ -89,17 +89,17 @@
The
.Ar action
parameter can take these values:
-.Bl -tag -width ".Va BLACKLIST_ABUSIVE_BEHAVIOR"
-.It Va BLACKLIST_AUTH_FAIL
+.Bl -tag -width ".Va BLOCKLIST_ABUSIVE_BEHAVIOR"
+.It Va BLOCKLIST_AUTH_FAIL
There was an unsuccessful authentication attempt.
-.It Va BLACKLIST_AUTH_OK
+.It Va BLOCKLIST_AUTH_OK
A user successfully authenticated.
-.It Va BLACKLIST_ABUSIVE_BEHAVIOR
+.It Va BLOCKLIST_ABUSIVE_BEHAVIOR
The sending daemon has detected abusive behavior
from the remote system.
The remote address should
be blocked as soon as possible.
-.It Va BLACKLIST_BAD_USER
+.It Va BLOCKLIST_BAD_USER
The sending daemon has determined the username
presented for authentication is invalid.
The
@@ -108,7 +108,7 @@
usernames and
blocks the address immediately if a forbidden username matches.
(The
-.Ar BLACKLIST_BAD_USER
+.Ar BLOCKLIST_BAD_USER
support is not currently available.)
.El
.Pp
Home |
Main Index |
Thread Index |
Old Index