Date: Tue, 31 Jul 2018 16:39:38 +0000 (UTC) From: Brad Davis <brd@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r336977 - in head: etc usr.sbin/blacklistd Message-ID: <201807311639.w6VGdcCr094637@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brd Date: Tue Jul 31 16:39:38 2018 New Revision: 336977 URL: https://svnweb.freebsd.org/changeset/base/336977 Log: Move blacklistd.conf to usr.sbin/blacklistd/ This is prep for pkging base and helps tag and install config files with the correct packages. Approved by: bapt (mentor) Differential Revision: https://reviews.freebsd.org/D16493 Added: head/usr.sbin/blacklistd/blacklistd.conf - copied unchanged from r336976, head/etc/blacklistd.conf Deleted: head/etc/blacklistd.conf Modified: head/etc/Makefile head/usr.sbin/blacklistd/Makefile Modified: head/etc/Makefile ============================================================================== --- head/etc/Makefile Tue Jul 31 16:08:38 2018 (r336976) +++ head/etc/Makefile Tue Jul 31 16:39:38 2018 (r336977) @@ -74,10 +74,6 @@ BIN1+= amd.map BIN1+= auto_master .endif -.if ${MK_BLACKLIST} != "no" -BIN1+= blacklistd.conf -.endif - .if ${MK_FREEBSD_UPDATE} != "no" BIN1+= freebsd-update.conf .endif Modified: head/usr.sbin/blacklistd/Makefile ============================================================================== --- head/usr.sbin/blacklistd/Makefile Tue Jul 31 16:08:38 2018 (r336976) +++ head/usr.sbin/blacklistd/Makefile Tue Jul 31 16:39:38 2018 (r336977) @@ -3,6 +3,7 @@ BLACKLIST_DIR=${SRCTOP}/contrib/blacklist .PATH: ${BLACKLIST_DIR}/bin ${BLACKLIST_DIR}/port +CONFS= blacklistd.conf PROG= blacklistd SRCS= blacklistd.c conf.c run.c state.c support.c internal.c \ sockaddr_snprintf.c pidfile.c strtoi.c popenve.c Copied: head/usr.sbin/blacklistd/blacklistd.conf (from r336976, head/etc/blacklistd.conf) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/usr.sbin/blacklistd/blacklistd.conf Tue Jul 31 16:39:38 2018 (r336977, copy of r336976, head/etc/blacklistd.conf) @@ -0,0 +1,17 @@ +# $FreeBSD$ +# +# Blacklist rule +# adr/mask:port type proto owner name nfail disable +[local] +ssh stream * * * 3 24h +ftp stream * * * 3 24h +smtp stream * * * 3 24h +submission stream * * * 3 24h +#6161 stream tcp6 christos * 2 10m +* * * * * 3 60 + +# adr/mask:port type proto owner name nfail disable +[remote] +#129.168.0.0/16 * * * = * * +#6161 = = = =/24 = = +#* stream tcp * = = =
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201807311639.w6VGdcCr094637>