D49505.id152673.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D49505.id152673.diff
View Options

	diff --git a/crypto/openssh/auth-pam.c b/crypto/openssh/auth-pam.c
	--- a/crypto/openssh/auth-pam.c
	+++ b/crypto/openssh/auth-pam.c
	@@ -101,6 +101,7 @@
	#endif
	#include "monitor_wrap.h"
	#include "srclimit.h"
	+#include "blacklist_client.h"

	extern ServerOptions options;
	extern struct sshbuf *loginmsg;
	@@ -936,6 +937,8 @@
	sshbuf_free(buffer);
	return (0);
	}
	+ BLACKLIST_NOTIFY(NULL, BLACKLIST_AUTH_FAIL,
	+ "PAM illegal user");
	error("PAM: %s for %s%.100s from %.100s", msg,
	sshpam_authctxt->valid ? "" : "illegal user ",
	sshpam_authctxt->user, sshpam_rhost);
	diff --git a/crypto/openssh/monitor.c b/crypto/openssh/monitor.c
	--- a/crypto/openssh/monitor.c
	+++ b/crypto/openssh/monitor.c
	@@ -1257,7 +1257,6 @@
	} else {
	/* Log failed attempt */
	auth_log(ssh, 0, 0, auth_method, NULL);
	- BLACKLIST_NOTIFY(ssh, BLACKLIST_AUTH_FAIL, "ssh");
	free(cuser);
	free(chost);
	}
	diff --git a/crypto/openssh/packet.c b/crypto/openssh/packet.c
	--- a/crypto/openssh/packet.c
	+++ b/crypto/openssh/packet.c
	@@ -96,6 +96,7 @@
	#include "packet.h"
	#include "ssherr.h"
	#include "sshbuf.h"
	+#include "blacklist_client.h"

	#ifdef PACKET_DEBUG
	#define DBG(x) x
	@@ -2021,6 +2022,8 @@
	case SSH_ERR_NO_KEX_ALG_MATCH:
	case SSH_ERR_NO_HOSTKEY_ALG_MATCH:
	if (ssh->kex && ssh->kex->failed_choice) {
	+ BLACKLIST_NOTIFY(ssh, BLACKLIST_AUTH_FAIL,
	+ "Unable to negotiate offer");
	ssh_packet_clear_keys(ssh);
	errno = oerrno;
	logdie("Unable to negotiate with %s: %s. "