diff options
author | Kurt Lidl <lidl@FreeBSD.org> | 2016-08-30 14:09:24 +0000 |
---|---|---|
committer | Kurt Lidl <lidl@FreeBSD.org> | 2016-08-30 14:09:24 +0000 |
commit | b2af61ec69826890d075ceb3e20e206be20d6fea (patch) | |
tree | b07556f925de070ec531b94068f89f06316066e7 /secure/usr.sbin/sshd | |
parent | 9287c0323dd839e0b1ac20c2a84878211865ee89 (diff) | |
download | src-b2af61ec69826890d075ceb3e20e206be20d6fea.tar.gz src-b2af61ec69826890d075ceb3e20e206be20d6fea.zip |
Add refactored blacklist support to sshd
Change the calls to of blacklist_init() and blacklist_notify to be
macros defined in the blacklist_client.h file. This avoids
the need for #ifdef USE_BLACKLIST / #endif except in the
blacklist.c file.
Remove redundent initialization attempts from within
blacklist_notify - everything always goes through
blacklistd_init().
Added UseBlacklist option to sshd, which defaults to off.
To enable the functionality, use '-o UseBlacklist=yes' on
the command line, or uncomment in the sshd_config file.
Reviewed by: des
Approved by: des
MFC after: 1 week
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D7051
Notes
Notes:
svn path=/head/; revision=305065
Diffstat (limited to 'secure/usr.sbin/sshd')
-rw-r--r-- | secure/usr.sbin/sshd/Makefile | 7 | ||||
-rw-r--r-- | secure/usr.sbin/sshd/Makefile.depend | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/secure/usr.sbin/sshd/Makefile b/secure/usr.sbin/sshd/Makefile index f9589a37ae37..af760992b725 100644 --- a/secure/usr.sbin/sshd/Makefile +++ b/secure/usr.sbin/sshd/Makefile @@ -40,6 +40,13 @@ CFLAGS+= -DUSE_BSM_AUDIT -DHAVE_GETAUDIT_ADDR LIBADD+= bsm .endif +.if ${MK_BLACKLIST_SUPPORT} != "no" +CFLAGS+= -DUSE_BLACKLIST -I${SRCTOP}/contrib/blacklist/include +SRCS+= blacklist.c +LIBADD+= blacklist +LDFLAGS+=-L${LIBBLACKLISTDIR} +.endif + .if ${MK_KERBEROS_SUPPORT} != "no" CFLAGS+= -include krb5_config.h SRCS+= krb5_config.h diff --git a/secure/usr.sbin/sshd/Makefile.depend b/secure/usr.sbin/sshd/Makefile.depend index d24b0bef5d55..220aae36c11c 100644 --- a/secure/usr.sbin/sshd/Makefile.depend +++ b/secure/usr.sbin/sshd/Makefile.depend @@ -17,6 +17,7 @@ DIRDEPS = \ kerberos5/lib/libroken \ kerberos5/lib/libwind \ lib/${CSU_DIR} \ + lib/libblacklist \ lib/libbsm \ lib/libc \ lib/libcom_err \ |