summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-03-02 23:31:50 +1100
committerDamien Miller <djm@mindrot.org>2000-03-02 23:31:50 +1100
commitc4cea3e5c71c8f2d48ee22ea05d26a47fb47ad29 (patch)
treec16a3f258f67064d05b6c46677792353d6258b68
parentc7d8dbbb0dfdeb3f854d58c9bf084db2b72ded77 (diff)
- Avoid warning message with Unix98 ptys
-rw-r--r--ChangeLog1
-rw-r--r--pty.c6
2 files changed, 4 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 12edfc444..4d3e87fbc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,7 @@
6 to detect library and header location _and_ ensure library has proper 6 to detect library and header location _and_ ensure library has proper
7 RSA support built in (this is a problem with OpenSSL 0.9.5). 7 RSA support built in (this is a problem with OpenSSL 0.9.5).
8 - Applied pty cleanup patch from markus.friedl@informatik.uni-erlangen.de 8 - Applied pty cleanup patch from markus.friedl@informatik.uni-erlangen.de
9 - Avoid warning message with Unix98 ptys
9 10
1020000207 1120000207
11 - Removed SOCKS code. Will support through a ProxyCommand. 12 - Removed SOCKS code. Will support through a ProxyCommand.
diff --git a/pty.c b/pty.c
index de6f751d8..27e0fe9e9 100644
--- a/pty.c
+++ b/pty.c
@@ -14,7 +14,7 @@
14 */ 14 */
15 15
16#include "includes.h" 16#include "includes.h"
17RCSID("$Id: pty.c,v 1.12 2000/03/02 12:30:53 damien Exp $"); 17RCSID("$Id: pty.c,v 1.13 2000/03/02 12:31:50 damien Exp $");
18 18
19#ifdef HAVE_UTIL_H 19#ifdef HAVE_UTIL_H
20# include <util.h> 20# include <util.h>
@@ -187,9 +187,9 @@ pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, int namebuflen)
187void 187void
188pty_release(const char *ttyname) 188pty_release(const char *ttyname)
189{ 189{
190 if (chown(ttyname, (uid_t) 0, (gid_t) 0) < 0) 190 if ((chown(ttyname, (uid_t) 0, (gid_t) 0) < 0) && (errno != ENOENT))
191 error("chown %.100s 0 0 failed: %.100s", ttyname, strerror(errno)); 191 error("chown %.100s 0 0 failed: %.100s", ttyname, strerror(errno));
192 if (chmod(ttyname, (mode_t) 0666) < 0) 192 if ((chmod(ttyname, (mode_t) 0666) < 0) && (errno != ENOENT))
193 error("chmod %.100s 0666 failed: %.100s", ttyname, strerror(errno)); 193 error("chmod %.100s 0666 failed: %.100s", ttyname, strerror(errno));
194} 194}
195 195