diff options
| author | dtucker@openbsd.org <dtucker@openbsd.org> | 2023-03-04 03:22:59 +0000 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2023-03-04 14:43:21 +1100 |
| commit | 6c165c36246d8004c20e1df5cec4961a5ac422d6 (patch) | |
| tree | 0fea24e45ea0277210c54806ca3b819e3f77d72b /channels.c | |
| parent | 4a3918f51bd2d968387e7aa87e33b32c78077fb4 (diff) | |
| download | openssh-git-6c165c36246d8004c20e1df5cec4961a5ac422d6.tar.gz | |
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 'channels.c')
| -rw-r--r-- | channels.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -1,4 +1,4 @@ -/* $OpenBSD: channels.c,v 1.427 2023/01/18 02:00:10 djm Exp $ */ +/* $OpenBSD: channels.c,v 1.428 2023/03/04 03:22:59 dtucker Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -198,7 +198,7 @@ struct ssh_channels { u_int x11_saved_data_len; /* Deadline after which all X11 connections are refused */ - u_int x11_refuse_time; + time_t x11_refuse_time; /* * Fake X11 authentication data. This is what the server will be @@ -1258,7 +1258,7 @@ x11_open_helper(struct ssh *ssh, struct sshbuf *b) /* Is this being called after the refusal deadline? */ if (sc->x11_refuse_time != 0 && - (u_int)monotime() >= sc->x11_refuse_time) { + monotime() >= sc->x11_refuse_time) { verbose("Rejected X11 connection after ForwardX11Timeout " "expired"); return -1; @@ -1879,7 +1879,7 @@ port_open_helper(struct ssh *ssh, Channel *c, char *rtype) } void -channel_set_x11_refuse_time(struct ssh *ssh, u_int refuse_time) +channel_set_x11_refuse_time(struct ssh *ssh, time_t refuse_time) { ssh->chanctxt->x11_refuse_time = refuse_time; } |