diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2021-01-11 02:12:57 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2021-01-11 15:04:12 +1100 |
| commit | 6d30673fedec2d251f4962c526fd0451f70c4d97 (patch) | |
| tree | 171f633481c7aa816fae802df3d6f2507ccc4fc7 /ssh-agent.c | |
| parent | 7a57adb8b07b2ad0aead4b2e09ee18edc04d0481 (diff) | |
| download | openssh-git-6d30673fedec2d251f4962c526fd0451f70c4d97.tar.gz | |
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 'ssh-agent.c')
| -rw-r--r-- | ssh-agent.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh-agent.c b/ssh-agent.c index 93f04f26..d231182d 100644 --- a/ssh-agent.c +++ b/ssh-agent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-agent.c,v 1.267 2020/11/08 22:37:24 djm Exp $ */ +/* $OpenBSD: ssh-agent.c,v 1.268 2021/01/11 02:12:58 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -164,7 +164,7 @@ u_char lock_salt[LOCK_SALT_SIZE]; extern char *__progname; /* Default lifetime in seconds (0 == forever) */ -static long lifetime = 0; +static int lifetime = 0; static int fingerprint_hash = SSH_FP_HASH_DEFAULT; |