diff options
| author | gjb <gjb@FreeBSD.org> | 2016-06-24 23:22:42 +0000 |
|---|---|---|
| committer | gjb <gjb@FreeBSD.org> | 2016-06-24 23:22:42 +0000 |
| commit | 70951739503fef6ff99a71f0515ee1eba2dbf895 (patch) | |
| tree | d6dfc00fb63fa1abb42bf72a0fd03692230e25ed /crypto/openssh/auth.c | |
| parent | 889a34531d5bbe582fe89dd7ac79ff196cefa035 (diff) | |
| download | FreeBSD-src-70951739503fef6ff99a71f0515ee1eba2dbf895.zip FreeBSD-src-70951739503fef6ff99a71f0515ee1eba2dbf895.tar.gz | |
Revert r301551, which added blacklistd(8) to sshd(8).
This change has functional impact, and other concerns raised
by the OpenSSH maintainer.
Requested by: des
PR: 210479 (related)
Approved by: re (marius)
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'crypto/openssh/auth.c')
| -rw-r--r-- | crypto/openssh/auth.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/crypto/openssh/auth.c b/crypto/openssh/auth.c index c23b55d..ba908801 100644 --- a/crypto/openssh/auth.c +++ b/crypto/openssh/auth.c @@ -75,9 +75,6 @@ __RCSID("$FreeBSD$"); #include "authfile.h" #include "ssherr.h" #include "compat.h" -#ifdef USE_BLACKLIST -#include "blacklist_client.h" -#endif /* import */ extern ServerOptions options; @@ -309,10 +306,6 @@ auth_log(Authctxt *authctxt, int authenticated, int partial, compat20 ? "ssh2" : "ssh1", authctxt->info != NULL ? ": " : "", authctxt->info != NULL ? authctxt->info : ""); -#ifdef USE_BLACKLIST - if (!authctxt->postponed) - blacklist_notify(!authenticated); -#endif free(authctxt->info); authctxt->info = NULL; @@ -647,9 +640,6 @@ getpwnamallow(const char *user) } #endif if (pw == NULL) { -#ifdef USE_BLACKLIST - blacklist_notify(1); -#endif logit("Invalid user %.100s from %.100s", user, get_remote_ipaddr()); #ifdef CUSTOM_FAILED_LOGIN |
