Attachment 1398 Details for Bug 1398 – Allows a multiplex slave to exit and generate a true exit value

[patch] Allows a multiplex slave to exit and generate a true exit value

openssh-4.7p1-multiplex.patch (text/plain), 1.04 KB, created by Greg Shively on 2007-12-19 08:54:46 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Shively

Created: 2007-12-19 08:54:46 AEDT

Size: 1.04 KB

patch

obsolete

>--- clientloop.c
>+++ clientloop.c
>@@ -883,6 +883,7 @@ client_process_control(fd_set *readset)
> 			xfree(cctx->term);
> 			buffer_free(&cctx->cmd);
> 			xfree(cctx);
>+			close(client_fd);
> 			return;
> 		}
> 	}
>--- ssh.c	2007-12-13 17:01:02.349474402 -0500
>+++ ssh.c	2007-12-13 17:40:28.541375268 -0500
>@@ -1365,6 +1365,7 @@
> 	if (options.forward_agent)
> 		flags |= SSHMUX_FLAG_AGENT_FWD;
>
>+	signal(SIGPIPE, SIG_IGN);
> 	buffer_init(&m);
>
> 	/* Send our command to server */
>@@ -1426,9 +1427,12 @@
> 	if (ssh_msg_send(sock, SSHMUX_VER, &m) == -1)
> 		fatal("%s: msg_send", __func__);
>
>-	mm_send_fd(sock, STDIN_FILENO);
>-	mm_send_fd(sock, STDOUT_FILENO);
>-	mm_send_fd(sock, STDERR_FILENO);
>+	if ( mm_send_fd(sock, STDIN_FILENO) == -1 )
>+		fatal("%s: failed to send stdin", __func__);
>+	else if ( mm_send_fd(sock, STDOUT_FILENO) == -1 )
>+		fatal("%s: failed to send stdout", __func__);
>+	else if ( mm_send_fd(sock, STDERR_FILENO) == -1 )
>+		fatal("%s: failed to send stderr", __func__);
>
> 	/* Wait for reply, so master has a chance to gather ttymodes */
> 	buffer_clear(&m);

Actions: View | Diff

Attachments on bug 1398: 1388 | 1389 | 1398 | 1399