summaryrefslogtreecommitdiff
path: root/sshd.c
diff options
context:
space:
mode:
authormarkus@openbsd.org <markus@openbsd.org>2020-07-03 10:12:26 +0000
committerDarren Tucker <dtucker@dtucker.net>2020-07-15 15:06:44 +1000
commitb0c1e8384d5e136ebdf895d1434aea7dd8661a1c (patch)
tree06ff8140c0007bdd04706ce72fb247ee14449a7b /sshd.c
parentcd119a5ec2bf0ed5df4daff3bd14f8f7566dafd3 (diff)
upstream: update setproctitle after re-exec; ok djm
OpenBSD-Commit-ID: bc92d122f9184ec2a9471ade754b80edd034ce8b
Diffstat (limited to 'sshd.c')
-rw-r--r--sshd.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sshd.c b/sshd.c
index ba01b1da7..d9a159f6a 100644
--- a/sshd.c
+++ b/sshd.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: sshd.c,v 1.559 2020/07/03 10:11:33 markus Exp $ */ 1/* $OpenBSD: sshd.c,v 1.560 2020/07/03 10:12:26 markus Exp $ */
2/* 2/*
3 * Author: Tatu Ylonen <ylo@cs.hut.fi> 3 * Author: Tatu Ylonen <ylo@cs.hut.fi>
4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -1726,6 +1726,7 @@ main(int ac, char **av)
1726 if ((cfg = sshbuf_new()) == NULL) 1726 if ((cfg = sshbuf_new()) == NULL)
1727 fatal("%s: sshbuf_new failed", __func__); 1727 fatal("%s: sshbuf_new failed", __func__);
1728 if (rexeced_flag) { 1728 if (rexeced_flag) {
1729 setproctitle("%s", "[rexeced]");
1729 recv_rexec_state(REEXEC_CONFIG_PASS_FD, cfg); 1730 recv_rexec_state(REEXEC_CONFIG_PASS_FD, cfg);
1730 if (!debug_flag) { 1731 if (!debug_flag) {
1731 startup_pipe = dup(REEXEC_STARTUP_PIPE_FD); 1732 startup_pipe = dup(REEXEC_STARTUP_PIPE_FD);