The branch main has been updated by emaste:

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

commit adb56e58e8db84d8087ebe3d3e7def0074cb5a90
Author:     Ed Maste <ema...@freebsd.org>
AuthorDate: 2021-09-16 18:08:27 +0000
Commit:     Ed Maste <ema...@freebsd.org>
CommitDate: 2021-09-16 18:10:11 +0000

    openssh: use global state for blacklist in grace_alarm_handler
    
    Obtained from:  security/openssh-portable
    Fixes:          19261079b743 ("openssh: update to OpenSSH v8.7p1")
    Sponsored by:   The FreeBSD Foundation
---
 crypto/openssh/sshd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/openssh/sshd.c b/crypto/openssh/sshd.c
index 864ad09b29fc..25a3769b4823 100644
--- a/crypto/openssh/sshd.c
+++ b/crypto/openssh/sshd.c
@@ -385,7 +385,7 @@ grace_alarm_handler(int sig)
                kill(0, SIGTERM);
        }
 
-       BLACKLIST_NOTIFY(NULL, BLACKLIST_AUTH_FAIL, "ssh");
+       BLACKLIST_NOTIFY(the_active_state, BLACKLIST_AUTH_FAIL, "ssh");
 
        /* Log error and exit. */
        if (use_privsep && pmonitor != NULL && pmonitor->m_pid <= 0)
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"

Reply via email to