D57027.id.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D57027.id.diff
View Options

	diff --git a/crypto/openssh/sshd-auth.c b/crypto/openssh/sshd-auth.c
	--- a/crypto/openssh/sshd-auth.c
	+++ b/crypto/openssh/sshd-auth.c
	@@ -96,6 +96,7 @@
	#include "srclimit.h"
	#include "ssh-sandbox.h"
	#include "dh.h"
	+#include "blocklist_client.h"

	/* Privsep fds */
	#define PRIVSEP_MONITOR_FD (STDERR_FILENO + 1)
	@@ -812,8 +813,10 @@
	free(hkalgs);

	if ((r = kex_exchange_identification(ssh, -1,
	- options.version_addendum)) != 0)
	+ options.version_addendum)) != 0) {
	+ BLOCKLIST_NOTIFY(ssh, BLOCKLIST_AUTH_FAIL, "Banner exchange");
	sshpkt_fatal(ssh, r, "banner exchange");
	+ }
	mm_sshkey_setcompat(ssh); /* tell monitor */

	if ((ssh->compat & SSH_BUG_NOREKEY))
	diff --git a/crypto/openssh/sshd-session.c b/crypto/openssh/sshd-session.c
	--- a/crypto/openssh/sshd-session.c
	+++ b/crypto/openssh/sshd-session.c
	@@ -1369,8 +1369,11 @@
	audit_event(the_active_state, SSH_CONNECTION_ABANDON);
	#endif
	/* Override default fatal exit value when auth was attempted */
	- if (i == 255 && monitor_auth_attempted())
	+ if (i == 255 && monitor_auth_attempted()) {
	+ BLOCKLIST_NOTIFY(the_active_state, BLOCKLIST_AUTH_FAIL,
	+ "Fatal exit");
	_exit(EXIT_AUTH_ATTEMPTED);
	+ }
	if (i == 255 && monitor_invalid_user())
	_exit(EXIT_INVALID_USER);
	_exit(i);