summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorderaadt@openbsd.org <deraadt@openbsd.org>2020-07-07 02:47:21 +0000
committerDarren Tucker <dtucker@dtucker.net>2020-07-15 15:08:10 +1000
commit6368022cd4dd508671c4999a59ec5826df098530 (patch)
tree49f3694096aaf41d47c411a5e7ea3180254ea71a
parent6d755706a0059eb9e2d63517f288b75cbc3b4701 (diff)
upstream: correct recently broken comments
OpenBSD-Commit-ID: 964d9a88f7de1d0eedd3f8070b43fb6e426351f1
-rw-r--r--monitor.c4
-rw-r--r--session.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/monitor.c b/monitor.c
index 325ad95e0..0107a7eba 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: monitor.c,v 1.211 2020/07/05 23:59:45 djm Exp $ */ 1/* $OpenBSD: monitor.c,v 1.212 2020/07/07 02:47:21 deraadt Exp $ */
2/* 2/*
3 * Copyright 2002 Niels Provos <provos@citi.umich.edu> 3 * Copyright 2002 Niels Provos <provos@citi.umich.edu>
4 * Copyright 2002 Markus Friedl <markus@openbsd.org> 4 * Copyright 2002 Markus Friedl <markus@openbsd.org>
@@ -1568,7 +1568,7 @@ mm_answer_pty(struct ssh *ssh, int sock, struct sshbuf *m)
1568 if (fd0 != 0) 1568 if (fd0 != 0)
1569 error("%s: fd0 %d != 0", __func__, fd0); 1569 error("%s: fd0 %d != 0", __func__, fd0);
1570 1570
1571 /* only need pty master side */ 1571 /* slave side of pty is not needed */
1572 close(s->ttyfd); 1572 close(s->ttyfd);
1573 s->ttyfd = s->ptyfd; 1573 s->ttyfd = s->ptyfd;
1574 /* no need to dup() because nobody closes ptyfd */ 1574 /* no need to dup() because nobody closes ptyfd */
diff --git a/session.c b/session.c
index ede983564..3f7488cde 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: session.c,v 1.323 2020/07/05 23:59:45 djm Exp $ */ 1/* $OpenBSD: session.c,v 1.324 2020/07/07 02:47:21 deraadt Exp $ */
2/* 2/*
3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 3 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
4 * All rights reserved 4 * All rights reserved
@@ -644,7 +644,7 @@ do_exec_pty(struct ssh *ssh, Session *s, const char *command)
644 644
645 s->pid = pid; 645 s->pid = pid;
646 646
647 /* Parent. Close the child side of the pseudo tty. */ 647 /* Parent. Close the slave side of the pseudo tty. */
648 close(ttyfd); 648 close(ttyfd);
649 649
650 /* Enter interactive session. */ 650 /* Enter interactive session. */