diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2021-01-11 03:12:57 +0100 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2021-01-11 05:04:12 +0100 |
| commit | 6d30673fedec2d251f4962c526fd0451f70c4d97 (patch) | |
| tree | 171f633481c7aa816fae802df3d6f2507ccc4fc7 /misc.h | |
| parent | upstream: add a comma to previous; (diff) | |
| download | openssh-6d30673fedec2d251f4962c526fd0451f70c4d97.tar.xz openssh-6d30673fedec2d251f4962c526fd0451f70c4d97.zip | |
upstream: Change convtime() from returning long to returning int.
On platforms where sizeof(int) != sizeof(long), convtime could accept values
>MAX_INT which subsequently truncate when stored in an int during config
parsing. bz#3250, ok djm@
OpenBSD-Commit-ID: 8fc932683d6b4660d52f50911d62bd6639c5db31
Diffstat (limited to 'misc.h')
| -rw-r--r-- | misc.h | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: misc.h,v 1.91 2020/12/22 00:12:22 djm Exp $ */ +/* $OpenBSD: misc.h,v 1.92 2021/01/11 02:12:57 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> @@ -67,7 +67,7 @@ char *colon(char *); int parse_user_host_path(const char *, char **, char **, char **); int parse_user_host_port(const char *, char **, char **, int *); int parse_uri(const char *, const char *, char **, char **, int *, char **); -long convtime(const char *); +int convtime(const char *); const char *fmt_timeframe(time_t t); char *tilde_expand_filename(const char *, uid_t); |