diff options
| author | Daniel Martin <consume.noise@gmail.com> | 2017-11-20 10:47:38 +0100 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2017-12-13 10:08:06 -0500 |
| commit | ee64427c6c5b22514b4d427fb9cee11b8239baea (patch) | |
| tree | 8a3a68722b51955289be9bacb74226ea7292b641 | |
| parent | 5c00e693631475679c1c2504e03177652ec7de28 (diff) | |
os/xdmcp: Honour -once when session is dead
Terminate a dead session when -once was passed. Don't restart it.
Signed-off-by: Daniel Martin <consume.noise@gmail.com>
Reviewed-by: Walter Harms <wharms@bfs.de>
(cherry picked from commit 918afeecbc63d70413e222efdb2ac4cfb16eae9e)
| -rw-r--r-- | os/xdmcp.c | 2 |
1 files changed, 1 insertions, 1 deletions
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(); |