Module Name: src
Committed By: christos
Date: Sat Dec 7 16:25:05 UTC 2019
Modified Files:
src/crypto/external/bsd/openssh/dist: sshd.c
Log Message:
don't call pfilter_notify() twice in grace_alarm_handler(). (kim@)
To generate a diff of this commit:
cvs rdiff -u -r1.36 -r1.37 src/crypto/external/bsd/openssh/dist/sshd.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssh/dist/sshd.c
diff -u src/crypto/external/bsd/openssh/dist/sshd.c:1.36 src/crypto/external/bsd/openssh/dist/sshd.c:1.37
--- src/crypto/external/bsd/openssh/dist/sshd.c:1.36 Sat Oct 12 14:32:22 2019
+++ src/crypto/external/bsd/openssh/dist/sshd.c Sat Dec 7 11:25:05 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: sshd.c,v 1.36 2019/10/12 18:32:22 christos Exp $ */
+/* $NetBSD: sshd.c,v 1.37 2019/12/07 16:25:05 christos Exp $ */
/* $OpenBSD: sshd.c,v 1.537 2019/06/28 13:35:04 deraadt Exp $ */
/*
* Author: Tatu Ylonen <y...@cs.hut.fi>
@@ -44,7 +44,7 @@
*/
#include "includes.h"
-__RCSID("$NetBSD: sshd.c,v 1.36 2019/10/12 18:32:22 christos Exp $");
+__RCSID("$NetBSD: sshd.c,v 1.37 2019/12/07 16:25:05 christos Exp $");
#include <sys/types.h>
#include <sys/param.h>
#include <sys/ioctl.h>
@@ -370,7 +370,6 @@ grace_alarm_handler(int sig)
/* XXX pre-format ipaddr/port so we don't need to access active_state */
/* Log error and exit. */
- pfilter_notify(1);
sigdie("Timeout before authentication for %s port %d",
ssh_remote_ipaddr(the_active_state),
ssh_remote_port(the_active_state));
