diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2021-07-12 06:22:57 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2021-07-12 17:38:47 +1000 |
| commit | fd2d06ae4442820429d634c0a8bae11c8e40c174 (patch) | |
| tree | f4487762e2fd54b3b04ad5dbaf5b6f6113efa611 /misc.c | |
| parent | 6c29b387cd64a57b0ec8ae7d2c8d02789d88fcc3 (diff) | |
upstream: 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@.
OpenBSD-Commit-ID: 835936f6837c86504b07cabb596b613600cf0f6e
Diffstat (limited to 'misc.c')
| -rw-r--r-- | misc.c | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -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. @@ -2384,9 +2384,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) |