From: markus@openbsd.org <markus@openbsd.org>
Date: Fri, 3 Jul 2020 10:12:26 +0000 (+0000)
Subject: upstream: update setproctitle after re-exec; ok djm
X-Git-Tag: V_8_4_P1~81
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b0c1e8384d5e136ebdf895d1434aea7dd8661a1c;p=thirdparty%2Fopenssh-portable.git

upstream: update setproctitle after re-exec; ok djm

OpenBSD-Commit-ID: bc92d122f9184ec2a9471ade754b80edd034ce8b
---

diff --git a/sshd.c b/sshd.c
index ba01b1da7..d9a159f6a 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshd.c,v 1.559 2020/07/03 10:11:33 markus Exp $ */
+/* $OpenBSD: sshd.c,v 1.560 2020/07/03 10:12:26 markus Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1726,6 +1726,7 @@ main(int ac, char **av)
 	if ((cfg = sshbuf_new()) == NULL)
 		fatal("%s: sshbuf_new failed", __func__);
 	if (rexeced_flag) {
+		setproctitle("%s", "[rexeced]");
 		recv_rexec_state(REEXEC_CONFIG_PASS_FD, cfg);
 		if (!debug_flag) {
 			startup_pipe = dup(REEXEC_STARTUP_PIPE_FD);