summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2000-03-09 22:31:13 +1100
committerDamien Miller <djm@mindrot.org>2000-03-09 22:31:13 +1100
commit8f975b6a189fd15cf0dfcce09ba7d7c97f36a16d (patch)
tree86dd353020278212e73ce57e63ea3d4f8701ccd8
parent98c7ad60ec5725d91da9f9f6d26cd9fe477398c0 (diff)
- Removed warning workaround for Linux and devpts filesystems (no longer
required after OpenBSD updates)
-rw-r--r--ChangeLog2
-rw-r--r--acconfig.h3
-rw-r--r--configure.in9
-rw-r--r--pty.c4
4 files changed, 3 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 68c577f6..9274eef5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -59,6 +59,8 @@
- fix pr 1113, fclose() -> pclose(), todo: remote popen()
- version 1.2.3
- Cleaned up
+ - Removed warning workaround for Linux and devpts filesystems (no longer
+ required after OpenBSD updates)
20000308
- Configure fix from Hiroshi Takekawa <takekawa@sr3.t.u-tokyo.ac.jp>
diff --git a/acconfig.h b/acconfig.h
index b0414cd2..7f51937a 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -153,9 +153,6 @@
/* getaddrinfo is broken (if present) */
#undef BROKEN_GETADDRINFO
-/* Whether Unix98 ptys are automatically removed when they are closed */
-#undef PTY_REMOVED_ON_CLOSE
-
@BOTTOM@
/* ******************* Shouldn't need to edit below this line ************** */
diff --git a/configure.in b/configure.in
index e02a026b..64f100ba 100644
--- a/configure.in
+++ b/configure.in
@@ -55,7 +55,6 @@ case "$host" in
;;
*-*-linux*)
no_dev_ptmx=1
- need_pty_removed_on_close=1
;;
*-*-netbsd*)
need_dash_r=1
@@ -543,14 +542,6 @@ AC_CHECK_FILE("/dev/ptc",
]
)
-# Some systems (defined in platform-specific code above) automagically remove
-# Unix98 ptys when they are closed
-if test "x$ac_cv_func_openpty" = "xyes" -o "x$have_dev_ptmx" = "x1" -o "x$have_dev_ptc" = "x1" ; then
- if test "x$need_pty_removed_on_close" = "x1" ; then
- AC_DEFINE(PTY_REMOVED_ON_CLOSE)
- fi
-fi
-
# Options from here on. Some of these are preset by platform above
# Check whether user wants GNOME ssh-askpass
diff --git a/pty.c b/pty.c
index cf8d6888..03a75488 100644
--- a/pty.c
+++ b/pty.c
@@ -14,7 +14,7 @@
*/
#include "includes.h"
-RCSID("$Id: pty.c,v 1.15 2000/03/09 10:27:51 damien Exp $");
+RCSID("$Id: pty.c,v 1.16 2000/03/09 11:31:13 damien Exp $");
#ifdef HAVE_UTIL_H
# include <util.h>
@@ -187,12 +187,10 @@ pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, int namebuflen)
void
pty_release(const char *ttyname)
{
-#ifndef PTY_REMOVED_ON_CLOSE
if (chown(ttyname, (uid_t) 0, (gid_t) 0) < 0)
error("chown %.100s 0 0 failed: %.100s", ttyname, strerror(errno));
if (chmod(ttyname, (mode_t) 0666) < 0)
error("chmod %.100s 0666 failed: %.100s", ttyname, strerror(errno));
-#endif /* PTY_REMOVED_ON_CLOSE */
}
/* Makes the tty the processes controlling tty and sets it to sane modes. */