Index: head/etc/Makefile =================================================================== --- head/etc/Makefile +++ head/etc/Makefile @@ -74,10 +74,6 @@ BIN1+= auto_master .endif -.if ${MK_BLACKLIST} != "no" -BIN1+= blacklistd.conf -.endif - .if ${MK_FREEBSD_UPDATE} != "no" BIN1+= freebsd-update.conf .endif Index: head/etc/blacklistd.conf =================================================================== --- head/etc/blacklistd.conf +++ head/etc/blacklistd.conf @@ -1,17 +0,0 @@ -# $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 * = = = Index: head/usr.sbin/blacklistd/Makefile =================================================================== --- head/usr.sbin/blacklistd/Makefile +++ head/usr.sbin/blacklistd/Makefile @@ -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 Index: head/usr.sbin/blacklistd/blacklistd.conf =================================================================== --- head/usr.sbin/blacklistd/blacklistd.conf +++ head/usr.sbin/blacklistd/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 * = = =