git: 73466449a9bf - stable/14 - sshd: remove blacklist call from grace_alarm_timer

The branch stable/14 has been updated by emaste:

URL: https://cgit.FreeBSD.org/src/commit/?id=73466449a9bf1888147c53d622236cebc0aa591b

commit 73466449a9bf1888147c53d622236cebc0aa591b
Author:     Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2024-08-01 00:04:46 +0000
Commit:     Ed Maste <emaste@FreeBSD.org>
CommitDate: 2024-08-06 19:39:40 +0000

    sshd: remove blacklist call from grace_alarm_timer
    
    Under certain circumstances it may call log(3), which is not async-
    signal-safe.
    
    For now just remove the blacklist integration from this path, which
    means that blacklistd will not detect and firewall hosts that establish
    a connection but do nothing further.
    
    Sponsored by:   The FreeBSD Foundation
    Differential Revision: https://reviews.freebsd.org/D46203
    
    (cherry picked from commit 2739a6845031e69be7c03461a9335d8bbb9f59bd)
    (cherry picked from commit 3d3bae9b95388169d396adc8007585699c5a23e0)
    
    Approved by:    so
---
 crypto/openssh/sshd.c        | 2 --
 crypto/openssh/sshd_config   | 2 +-
 crypto/openssh/sshd_config.5 | 2 +-
 crypto/openssh/version.h     | 2 +-
 4 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/crypto/openssh/sshd.c b/crypto/openssh/sshd.c
index 0c83e0ea468e..889f2056bc75 100644
--- a/crypto/openssh/sshd.c
+++ b/crypto/openssh/sshd.c
@@ -377,8 +377,6 @@ grace_alarm_handler(int sig)
 		kill(0, SIGTERM);
 	}
 
-	BLACKLIST_NOTIFY(the_active_state, BLACKLIST_AUTH_FAIL, "ssh");
-
 	/* Log error and exit. */
 	sigdie("Timeout before authentication for %s port %d",
 	    ssh_remote_ipaddr(the_active_state),
diff --git a/crypto/openssh/sshd_config b/crypto/openssh/sshd_config
index a06f8fcc13d1..7f559775e3b3 100644
--- a/crypto/openssh/sshd_config
+++ b/crypto/openssh/sshd_config
@@ -105,7 +105,7 @@ AuthorizedKeysFile	.ssh/authorized_keys
 #PermitTunnel no
 #ChrootDirectory none
 #UseBlacklist no
-#VersionAddendum FreeBSD-20240318
+#VersionAddendum FreeBSD-20240806
 
 # no default banner path
 #Banner none
diff --git a/crypto/openssh/sshd_config.5 b/crypto/openssh/sshd_config.5
index 0715b1f9d581..4de510ac8795 100644
--- a/crypto/openssh/sshd_config.5
+++ b/crypto/openssh/sshd_config.5
@@ -1944,7 +1944,7 @@ The default is
 Optionally specifies additional text to append to the SSH protocol banner
 sent by the server upon connection.
 The default is
-.Qq FreeBSD-20240318 .
+.Qq FreeBSD-20240806 .
 The value
 .Cm none
 may be used to disable this.
diff --git a/crypto/openssh/version.h b/crypto/openssh/version.h
index 836b5650b247..82be0be8498f 100644
--- a/crypto/openssh/version.h
+++ b/crypto/openssh/version.h
@@ -5,4 +5,4 @@
 #define SSH_PORTABLE	"p1"
 #define SSH_RELEASE	SSH_VERSION SSH_PORTABLE
 
-#define SSH_VERSION_FREEBSD	"FreeBSD-20240701"
+#define SSH_VERSION_FREEBSD	"FreeBSD-20240806"