[PATCH xserver 05/24] os/xdmcp: Remove dead 'restart' code

[Keith Packard]

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.

Signed-off-by: Keith Packard <keithp at keithp.com>
---
 os/xdmcp.c | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/os/xdmcp.c b/os/xdmcp.c
index b265db3..b1ee5d2 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)
 {
-- 
2.5.0