diff options
| author | Keith Packard <keithp@keithp.com> | 2015-09-21 07:16:16 +0100 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2015-10-26 12:19:02 -0400 |
| commit | abe44851018d0e5bace2971682e724aa7444e96f (patch) | |
| tree | dbebe227fd7a94022840f3abc5f2ff4c77169c94 | |
| parent | c72d4f00277c977faecd697ef3407518f11f909d (diff) | |
os/xdmcp: Remove dead 'restart' code
The X server used to wait for the user to hit a key or move the mouse
before restarting the session after a keepalive failure. This,
presumably, was to avoid having the X server continuously spew XDMCP
protocol on the network while the XDM server was dead.
Switching into this state was removed from the server some time before
XFree86 4.3.99.16, so the remaining bits of code have been dead for
over a decade, and no-one ever noticed.
Reviewed-by: Adam Jackson <ajax@redhat.com>
Signed-off-by: Keith Packard <keithp@keithp.com>
(cherry picked from commit a3a40291330bad10401fe2bcdbc097ce742b026a)
| -rw-r--r-- | os/xdmcp.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/os/xdmcp.c b/os/xdmcp.c index b265db338..b1ee5d255 100644 --- a/os/xdmcp.c +++ b/os/xdmcp.c @@ -199,8 +199,6 @@ static void send_packet(void); static void timeout(void); -static void restart(void); - static void XdmcpBlockHandler(void *data , struct timeval **wt, void *LastSelectMask); @@ -708,9 +706,7 @@ XdmcpWakeupHandler(void *data, /* unused */ #endif XFD_ANDSET(&devicesReadable, last_select_mask, &EnabledDevices); if (XFD_ANYSET(&devicesReadable)) { - if (state == XDM_AWAIT_USER_INPUT) - restart(); - else if (state == XDM_RUN_SESSION) + if (state == XDM_RUN_SESSION) keepaliveDormancy = defaultKeepaliveDormancy; } if (XFD_ANYSET(&AllClients) && state == XDM_RUN_SESSION) @@ -936,14 +932,6 @@ timeout(void) send_packet(); } -static void -restart(void) -{ - state = XDM_INIT_STATE; - timeOutRtx = 0; - send_packet(); -} - static int XdmcpCheckAuthentication(ARRAY8Ptr Name, ARRAY8Ptr Data, int packet_type) { |