aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-03-15 13:27:12 +0000
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2017-03-19 22:25:36 +0100
commit074646707400ff659909fff1f059f58f44493a38 (patch)
tree04f54be19ac23dbe3a00c948217e94edd1562abd /nx-X11/programs/Xserver
parentb7c389b9a0fa366a40ab272a9429a52ecee7365d (diff)
downloadnx-libs-074646707400ff659909fff1f059f58f44493a38.tar.gz
nx-libs-074646707400ff659909fff1f059f58f44493a38.tar.bz2
nx-libs-074646707400ff659909fff1f059f58f44493a38.zip
os/xdmcp: Remove dead 'restart' code
Completing the below X.org commit: commit a3a40291330bad10401fe2bcdbc097ce742b026a Author: Keith Packard <keithp@keithp.com> Date: Mon Sep 21 07:16:16 2015 +0100 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> Backported-to-NX-by: Mike Gabriel <mike.gabriel@das-netzwerkteam.de>
Diffstat (limited to 'nx-X11/programs/Xserver')
-rw-r--r--nx-X11/programs/Xserver/os/xdmcp.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/nx-X11/programs/Xserver/os/xdmcp.c b/nx-X11/programs/Xserver/os/xdmcp.c
index c4b71f6ec..c1aa57e95 100644
--- a/nx-X11/programs/Xserver/os/xdmcp.c
+++ b/nx-X11/programs/Xserver/os/xdmcp.c
@@ -205,8 +205,6 @@ extern void XdmcpDeadSession(char * /*reason*/);
static void timeout(void);
-static void restart(void);
-
static void XdmcpBlockHandler(
void * /*data*/,
struct timeval ** /*wt*/,
@@ -959,14 +957,6 @@ timeout(void)
send_packet();
}
-static void
-restart(void)
-{
- state = XDM_INIT_STATE;
- timeOutRtx = 0;
- send_packet();
-}
-
int
XdmcpCheckAuthentication (
ARRAY8Ptr Name,