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/sshd.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/sshd.c')
| -rw-r--r-- | crypto/openssh/sshd.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/crypto/openssh/sshd.c b/crypto/openssh/sshd.c index d1159291..dd7fcdd 100644 --- a/crypto/openssh/sshd.c +++ b/crypto/openssh/sshd.c @@ -135,9 +135,6 @@ __RCSID("$FreeBSD$"); #include "ssh-sandbox.h" #include "version.h" #include "ssherr.h" -#ifdef USE_BLACKLIST -#include "blacklist_client.h" -#endif #ifdef LIBWRAP #include <tcpd.h> @@ -391,9 +388,6 @@ grace_alarm_handler(int sig) kill(0, SIGTERM); } -#ifdef USE_BLACKLIST - blacklist_notify(1); -#endif /* Log error and exit. */ sigdie("Timeout before authentication for %s", get_remote_ipaddr()); } @@ -655,10 +649,6 @@ privsep_preauth_child(void) /* Demote the private keys to public keys. */ demote_sensitive_data(); -#ifdef USE_BLACKLIST - blacklist_init(); -#endif - /* Demote the child */ if (getuid() == 0 || geteuid() == 0) { /* Change our root directory */ @@ -1282,9 +1272,6 @@ server_accept_loop(int *sock_in, int *sock_out, int *newsock, int *config_s) for (i = 0; i < options.max_startups; i++) startup_pipes[i] = -1; -#ifdef USE_BLACKLIST - blacklist_init(); -#endif /* * Stay listening for connections until the system crashes or * the daemon is killed with a signal. |
