[PATCH xserver 1/6] os/xdmcp: Honour -once when session is dead

Daniel Martin consume.noise at gmail.com
Mon Nov 20 09:47:38 UTC 2017


Terminate a dead session when -once was passed. Don't restart it.

Signed-off-by: Daniel Martin <consume.noise at gmail.com>
Reviewed-by: Walter Harms <wharms at bfs.de>
---
 os/xdmcp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/os/xdmcp.c b/os/xdmcp.c
index 906c95944..7aeb393e6 100644
--- a/os/xdmcp.c
+++ b/os/xdmcp.c
@@ -797,7 +797,7 @@ XdmcpDeadSession(const char *reason)
     ErrorF("XDM: %s, declaring session dead\n", reason);
     state = XDM_INIT_STATE;
     isItTimeToYield = TRUE;
-    dispatchException |= DE_RESET;
+    dispatchException |= (OneSession ? DE_TERMINATE : DE_RESET);
     TimerCancel(xdmcp_timer);
     timeOutRtx = 0;
     send_packet();
-- 
2.13.6



More information about the xorg-devel mailing list