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

[Daniel Martin]

Imho this could be picked for 1.19. Anyone willing to give his Rb?

On 30 September 2016 at 14:05, Daniel Martin <consume.noise at gmail.com> wrote:
> Terminate a dead session when -once was passed. Don't restart it.
>
> Signed-off-by: Daniel Martin <consume.noise at gmail.com>
> ---
>  os/xdmcp.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/os/xdmcp.c b/os/xdmcp.c
> index 906c959..7aeb393 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.10.0
>