summaryrefslogtreecommitdiffstats
path: root/channels.h
diff options
context:
space:
mode:
authordtucker@openbsd.org <dtucker@openbsd.org>2023-03-04 04:22:59 +0100
committerDarren Tucker <dtucker@dtucker.net>2023-03-04 04:43:21 +0100
commit6c165c36246d8004c20e1df5cec4961a5ac422d6 (patch)
tree0fea24e45ea0277210c54806ca3b819e3f77d72b /channels.h
parentupstream: Ensure ms_remain is always initialized (diff)
downloadopenssh-6c165c36246d8004c20e1df5cec4961a5ac422d6.tar.xz
openssh-6c165c36246d8004c20e1df5cec4961a5ac422d6.zip
upstream: Use time_t for x11 timeout.
Use time_t instead of u_int for remaining x11 timeout checks for 64bit time_t safety. From Coverity CIDs 405197 and 405028, ok djm@ OpenBSD-Commit-ID: 356685bfa1fc3d81bd95722d3fc47101cc1a4972
Diffstat (limited to '')
-rw-r--r--channels.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/channels.h b/channels.h
index 101843a06..91cc466cc 100644
--- a/channels.h
+++ b/channels.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: channels.h,v 1.148 2023/01/18 02:00:10 djm Exp $ */
+/* $OpenBSD: channels.h,v 1.149 2023/03/04 03:22:59 dtucker Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
@@ -375,7 +375,7 @@ int permitopen_port(const char *);
/* x11 forwarding */
-void channel_set_x11_refuse_time(struct ssh *, u_int);
+void channel_set_x11_refuse_time(struct ssh *, time_t);
int x11_connect_display(struct ssh *);
int x11_create_display_inet(struct ssh *, int, int, int, u_int *, int **);
void x11_request_forwarding_with_spoofing(struct ssh *, int,