From 203bb886797677aa5d61b57be83cfdc1b634bc9c Mon Sep 17 00:00:00 2001 From: "dtucker@openbsd.org" Date: Mon, 2 Jun 2025 14:09:34 +0000 Subject: [PATCH] upstream: Fix x11_channel_used_recently() to return true when channel has been used within the last second, instead of more than a second ago. Should fix ~5s delay on X client startup when ObscureKeystrokeTiming is enabled. bz#3820, ok (& sigh) djm@ OpenBSD-Commit-ID: b741011e81fb3e3d42711d9bd3ed8a959924dee4 --- channels.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/channels.c b/channels.c index f71f82466..0efbd8d17 100644 --- a/channels.c +++ b/channels.c @@ -1,4 +1,4 @@ -/* $OpenBSD: channels.c,v 1.445 2025/05/29 13:27:27 dtucker Exp $ */ +/* $OpenBSD: channels.c,v 1.446 2025/06/02 14:09:34 dtucker Exp $ */ /* * Author: Tatu Ylonen * Copyright (c) 1995 Tatu Ylonen , Espoo, Finland @@ -5356,5 +5356,5 @@ x11_channel_used_recently(struct ssh *ssh) { if (c->lastused > lastused) lastused = c->lastused; } - return lastused != 0 && monotime() > lastused + 1; + return lastused != 0 && monotime() <= lastused + 1; } -- 2.47.2