diff options
-rw-r--r-- | ChangeLog | 2 | ||||
-rw-r--r-- | acconfig.h | 3 | ||||
-rw-r--r-- | configure.in | 9 | ||||
-rw-r--r-- | pty.c | 4 |
4 files changed, 3 insertions, 15 deletions
@@ -59,6 +59,8 @@ | |||
59 | - fix pr 1113, fclose() -> pclose(), todo: remote popen() | 59 | - fix pr 1113, fclose() -> pclose(), todo: remote popen() |
60 | - version 1.2.3 | 60 | - version 1.2.3 |
61 | - Cleaned up | 61 | - Cleaned up |
62 | - Removed warning workaround for Linux and devpts filesystems (no longer | ||
63 | required after OpenBSD updates) | ||
62 | 64 | ||
63 | 20000308 | 65 | 20000308 |
64 | - Configure fix from Hiroshi Takekawa <takekawa@sr3.t.u-tokyo.ac.jp> | 66 | - Configure fix from Hiroshi Takekawa <takekawa@sr3.t.u-tokyo.ac.jp> |
diff --git a/acconfig.h b/acconfig.h index b0414cd2b..7f51937a4 100644 --- a/acconfig.h +++ b/acconfig.h | |||
@@ -153,9 +153,6 @@ | |||
153 | /* getaddrinfo is broken (if present) */ | 153 | /* getaddrinfo is broken (if present) */ |
154 | #undef BROKEN_GETADDRINFO | 154 | #undef BROKEN_GETADDRINFO |
155 | 155 | ||
156 | /* Whether Unix98 ptys are automatically removed when they are closed */ | ||
157 | #undef PTY_REMOVED_ON_CLOSE | ||
158 | |||
159 | @BOTTOM@ | 156 | @BOTTOM@ |
160 | 157 | ||
161 | /* ******************* Shouldn't need to edit below this line ************** */ | 158 | /* ******************* Shouldn't need to edit below this line ************** */ |
diff --git a/configure.in b/configure.in index e02a026bb..64f100bae 100644 --- a/configure.in +++ b/configure.in | |||
@@ -55,7 +55,6 @@ case "$host" in | |||
55 | ;; | 55 | ;; |
56 | *-*-linux*) | 56 | *-*-linux*) |
57 | no_dev_ptmx=1 | 57 | no_dev_ptmx=1 |
58 | need_pty_removed_on_close=1 | ||
59 | ;; | 58 | ;; |
60 | *-*-netbsd*) | 59 | *-*-netbsd*) |
61 | need_dash_r=1 | 60 | need_dash_r=1 |
@@ -543,14 +542,6 @@ AC_CHECK_FILE("/dev/ptc", | |||
543 | ] | 542 | ] |
544 | ) | 543 | ) |
545 | 544 | ||
546 | # Some systems (defined in platform-specific code above) automagically remove | ||
547 | # Unix98 ptys when they are closed | ||
548 | if test "x$ac_cv_func_openpty" = "xyes" -o "x$have_dev_ptmx" = "x1" -o "x$have_dev_ptc" = "x1" ; then | ||
549 | if test "x$need_pty_removed_on_close" = "x1" ; then | ||
550 | AC_DEFINE(PTY_REMOVED_ON_CLOSE) | ||
551 | fi | ||
552 | fi | ||
553 | |||
554 | # Options from here on. Some of these are preset by platform above | 545 | # Options from here on. Some of these are preset by platform above |
555 | 546 | ||
556 | # Check whether user wants GNOME ssh-askpass | 547 | # Check whether user wants GNOME ssh-askpass |
@@ -14,7 +14,7 @@ | |||
14 | */ | 14 | */ |
15 | 15 | ||
16 | #include "includes.h" | 16 | #include "includes.h" |
17 | RCSID("$Id: pty.c,v 1.15 2000/03/09 10:27:51 damien Exp $"); | 17 | RCSID("$Id: pty.c,v 1.16 2000/03/09 11:31:13 damien Exp $"); |
18 | 18 | ||
19 | #ifdef HAVE_UTIL_H | 19 | #ifdef HAVE_UTIL_H |
20 | # include <util.h> | 20 | # include <util.h> |
@@ -187,12 +187,10 @@ pty_allocate(int *ptyfd, int *ttyfd, char *namebuf, int namebuflen) | |||
187 | void | 187 | void |
188 | pty_release(const char *ttyname) | 188 | pty_release(const char *ttyname) |
189 | { | 189 | { |
190 | #ifndef PTY_REMOVED_ON_CLOSE | ||
191 | if (chown(ttyname, (uid_t) 0, (gid_t) 0) < 0) | 190 | if (chown(ttyname, (uid_t) 0, (gid_t) 0) < 0) |
192 | error("chown %.100s 0 0 failed: %.100s", ttyname, strerror(errno)); | 191 | error("chown %.100s 0 0 failed: %.100s", ttyname, strerror(errno)); |
193 | if (chmod(ttyname, (mode_t) 0666) < 0) | 192 | if (chmod(ttyname, (mode_t) 0666) < 0) |
194 | error("chmod %.100s 0666 failed: %.100s", ttyname, strerror(errno)); | 193 | error("chmod %.100s 0666 failed: %.100s", ttyname, strerror(errno)); |
195 | #endif /* PTY_REMOVED_ON_CLOSE */ | ||
196 | } | 194 | } |
197 | 195 | ||
198 | /* Makes the tty the processes controlling tty and sets it to sane modes. */ | 196 | /* Makes the tty the processes controlling tty and sets it to sane modes. */ |