From: Damien Miller <djm@google.com>
Date: Thu, 9 Apr 2015 00:14:48 +0000 (+1000)
Subject: platform's with openpty don't need pty_release
X-Git-Tag: V_6_9_P1~121
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=597986493412c499f2bc2209420cb195f97b3668;p=thirdparty%2Fopenssh-portable.git

platform's with openpty don't need pty_release
---

diff --git a/sshpty.c b/sshpty.c
index d2ff8c16a..7bb764163 100644
--- a/sshpty.c
+++ b/sshpty.c
@@ -85,12 +85,12 @@ pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, size_t namebuflen)
 void
 pty_release(const char *tty)
 {
-#ifndef __APPLE_PRIVPTY__
+#if !defined(__APPLE_PRIVPTY__) && !defined(HAVE_OPENPTY)
 	if (chown(tty, (uid_t) 0, (gid_t) 0) < 0)
 		error("chown %.100s 0 0 failed: %.100s", tty, strerror(errno));
 	if (chmod(tty, (mode_t) 0666) < 0)
 		error("chmod %.100s 0666 failed: %.100s", tty, strerror(errno));
-#endif /* __APPLE_PRIVPTY__ */
+#endif /* !__APPLE_PRIVPTY__ && !HAVE_OPENPTY */
 }
 
 /* Makes the tty the process's controlling tty and sets it to sane modes. */