[openssh-commits] [openssh] 06/08: upstream: correct recently broken comments
git+noreply at mindrot.org
git+noreply at mindrot.org
Wed Jul 15 15:09:07 AEST 2020
This is an automated email from the git hooks/post-receive script.
dtucker pushed a commit to branch master
in repository openssh.
commit 6368022cd4dd508671c4999a59ec5826df098530
Author: deraadt at openbsd.org <deraadt at openbsd.org>
Date: Tue Jul 7 02:47:21 2020 +0000
upstream: correct recently broken comments
OpenBSD-Commit-ID: 964d9a88f7de1d0eedd3f8070b43fb6e426351f1
---
monitor.c | 4 ++--
session.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/monitor.c b/monitor.c
index 325ad95e..0107a7eb 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: monitor.c,v 1.211 2020/07/05 23:59:45 djm Exp $ */
+/* $OpenBSD: monitor.c,v 1.212 2020/07/07 02:47:21 deraadt Exp $ */
/*
* Copyright 2002 Niels Provos <provos at citi.umich.edu>
* Copyright 2002 Markus Friedl <markus at openbsd.org>
@@ -1568,7 +1568,7 @@ mm_answer_pty(struct ssh *ssh, int sock, struct sshbuf *m)
if (fd0 != 0)
error("%s: fd0 %d != 0", __func__, fd0);
- /* only need pty master side */
+ /* slave side of pty is not needed */
close(s->ttyfd);
s->ttyfd = s->ptyfd;
/* no need to dup() because nobody closes ptyfd */
diff --git a/session.c b/session.c
index ede98356..3f7488cd 100644
--- a/session.c
+++ b/session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: session.c,v 1.323 2020/07/05 23:59:45 djm Exp $ */
+/* $OpenBSD: session.c,v 1.324 2020/07/07 02:47:21 deraadt Exp $ */
/*
* Copyright (c) 1995 Tatu Ylonen <ylo at cs.hut.fi>, Espoo, Finland
* All rights reserved
@@ -644,7 +644,7 @@ do_exec_pty(struct ssh *ssh, Session *s, const char *command)
s->pid = pid;
- /* Parent. Close the child side of the pseudo tty. */
+ /* Parent. Close the slave side of the pseudo tty. */
close(ttyfd);
/* Enter interactive session. */
--
To stop receiving notification emails like this one, please contact
djm at mindrot.org.
More information about the openssh-commits
mailing list