summaryrefslogtreecommitdiff
path: root/usr.bin/ssh/misc.h
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@cvs.openbsd.org>2021-01-11 02:12:59 +0000
committerDarren Tucker <dtucker@cvs.openbsd.org>2021-01-11 02:12:59 +0000
commitd96d053a4247c9293acb7e5119de205b7f33a6ea (patch)
tree683e0eab56ec1bbadc5a3bb72f71fd84d7262313 /usr.bin/ssh/misc.h
parent1e27c313cc770b1999f5471e7ef31cc96eb2d0cd (diff)
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@
Diffstat (limited to 'usr.bin/ssh/misc.h')
-rw-r--r--usr.bin/ssh/misc.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.bin/ssh/misc.h b/usr.bin/ssh/misc.h
index 4bba0f0f892..5335ddd0e48 100644
--- a/usr.bin/ssh/misc.h
+++ b/usr.bin/ssh/misc.h
@@ -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);