From f12770d1a7c4225248ed09f14d64a7a558fdadc7 Mon Sep 17 00:00:00 2001
From: dtucker <dtucker@openbsd.org>
Date: Mon, 12 Jul 2021 06:22:57 +0000
Subject: [PATCH] Make limit for time_t test unconditional in the
 format_absolute_time fix for bz#3329 that allows printing of timestamps past
 INT_MAX. This was incorrectly included with the previous commit.   Based on
 discussion with djm@.

---
 usr.bin/ssh/misc.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/usr.bin/ssh/misc.c b/usr.bin/ssh/misc.c
index aff0e1a433d..7db717437ad 100644
--- a/usr.bin/ssh/misc.c
+++ b/usr.bin/ssh/misc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: misc.c,v 1.167 2021/07/02 07:20:44 dtucker Exp $ */
+/* $OpenBSD: misc.c,v 1.168 2021/07/12 06:22:57 dtucker Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  * Copyright (c) 2005-2020 Damien Miller.  All rights reserved.
@@ -2285,9 +2285,7 @@ parse_absolute_time(const char *s, uint64_t *tp)
 }
 
 /* On OpenBSD time_t is int64_t which is long long. */
-#ifndef SSH_TIME_T_MAX
-# define SSH_TIME_T_MAX LLONG_MAX
-#endif
+#define SSH_TIME_T_MAX LLONG_MAX
 
 void
 format_absolute_time(uint64_t t, char *buf, size_t len)
-- 
2.20.1