From 348c3e69de7e8ce7573d349851ace3e20f4333af Mon Sep 17 00:00:00 2001 From: Tiago Cunha Date: Sun, 6 Jun 2010 00:04:59 +0000 Subject: [PATCH] Sync OpenBSD patchset 705: Don't die if the client has been detached when the job finishes, just don't display the output. --- cmd-run-shell.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cmd-run-shell.c b/cmd-run-shell.c index cc2ec0c3..0a4a4095 100644 --- a/cmd-run-shell.c +++ b/cmd-run-shell.c @@ -1,4 +1,4 @@ -/* $Id: cmd-run-shell.c,v 1.6 2009-11-14 17:56:39 tcunha Exp $ */ +/* $Id: cmd-run-shell.c,v 1.7 2010-06-06 00:04:59 tcunha Exp $ */ /* * Copyright (c) 2009 Tiago Cunha @@ -82,6 +82,11 @@ cmd_run_shell_callback(struct job *job) int retcode; u_int lines; + if (ctx->cmdclient != NULL && ctx->cmdclient->flags & CLIENT_DEAD) + return; + if (ctx->curclient != NULL && ctx->curclient->flags & CLIENT_DEAD) + return; + lines = 0; do { if ((line = evbuffer_readline(job->event->input)) != NULL) {