diff options
author | Damien Miller <djm@mindrot.org> | 2003-02-24 11:54:10 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2003-02-24 11:54:10 +1100 |
commit | e8cea9e7553aa7df59608c0ae7a5a8dcbcde95a6 (patch) | |
tree | 04386768afa219c5b5e5a173989670c2a78dd393 | |
parent | babb47a059148bb97de254f8964dffe7dab213dc (diff) |
- markus@cvs.openbsd.org 2003/02/03 08:56:16
[sshpty.c]
don't call error() for readonly /dev; from soekris list; ok mcbride,
henning, deraadt.
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | sshpty.c | 6 |
2 files changed, 8 insertions, 4 deletions
@@ -28,6 +28,10 @@ | |||
28 | [kex.c] | 28 | [kex.c] |
29 | add support for key exchange guesses; based on work by | 29 | add support for key exchange guesses; based on work by |
30 | avraham.fraenkel@commatch.com; fixes bug #148; ok deraadt@ | 30 | avraham.fraenkel@commatch.com; fixes bug #148; ok deraadt@ |
31 | - markus@cvs.openbsd.org 2003/02/03 08:56:16 | ||
32 | [sshpty.c] | ||
33 | don't call error() for readonly /dev; from soekris list; ok mcbride, | ||
34 | henning, deraadt. | ||
31 | 35 | ||
32 | 20030211 | 36 | 20030211 |
33 | - (djm) Cygwin needs libcrypt too. Patch from vinschen@redhat.com | 37 | - (djm) Cygwin needs libcrypt too. Patch from vinschen@redhat.com |
@@ -1128,4 +1132,4 @@ | |||
1128 | save auth method before monitor_reset_key_state(); bugzilla bug #284; | 1132 | save auth method before monitor_reset_key_state(); bugzilla bug #284; |
1129 | ok provos@ | 1133 | ok provos@ |
1130 | 1134 | ||
1131 | $Id: ChangeLog,v 1.2600 2003/02/24 00:53:32 djm Exp $ | 1135 | $Id: ChangeLog,v 1.2601 2003/02/24 00:54:10 djm Exp $ |
@@ -12,7 +12,7 @@ | |||
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include "includes.h" | 14 | #include "includes.h" |
15 | RCSID("$OpenBSD: sshpty.c,v 1.7 2002/06/24 17:57:20 deraadt Exp $"); | 15 | RCSID("$OpenBSD: sshpty.c,v 1.8 2003/02/03 08:56:16 markus Exp $"); |
16 | 16 | ||
17 | #ifdef HAVE_UTIL_H | 17 | #ifdef HAVE_UTIL_H |
18 | # include <util.h> | 18 | # include <util.h> |
@@ -394,7 +394,7 @@ pty_setowner(struct passwd *pw, const char *ttyname) | |||
394 | if (chown(ttyname, pw->pw_uid, gid) < 0) { | 394 | if (chown(ttyname, pw->pw_uid, gid) < 0) { |
395 | if (errno == EROFS && | 395 | if (errno == EROFS && |
396 | (st.st_uid == pw->pw_uid || st.st_uid == 0)) | 396 | (st.st_uid == pw->pw_uid || st.st_uid == 0)) |
397 | error("chown(%.100s, %u, %u) failed: %.100s", | 397 | debug("chown(%.100s, %u, %u) failed: %.100s", |
398 | ttyname, (u_int)pw->pw_uid, (u_int)gid, | 398 | ttyname, (u_int)pw->pw_uid, (u_int)gid, |
399 | strerror(errno)); | 399 | strerror(errno)); |
400 | else | 400 | else |
@@ -408,7 +408,7 @@ pty_setowner(struct passwd *pw, const char *ttyname) | |||
408 | if (chmod(ttyname, mode) < 0) { | 408 | if (chmod(ttyname, mode) < 0) { |
409 | if (errno == EROFS && | 409 | if (errno == EROFS && |
410 | (st.st_mode & (S_IRGRP | S_IROTH)) == 0) | 410 | (st.st_mode & (S_IRGRP | S_IROTH)) == 0) |
411 | error("chmod(%.100s, 0%o) failed: %.100s", | 411 | debug("chmod(%.100s, 0%o) failed: %.100s", |
412 | ttyname, mode, strerror(errno)); | 412 | ttyname, mode, strerror(errno)); |
413 | else | 413 | else |
414 | fatal("chmod(%.100s, 0%o) failed: %.100s", | 414 | fatal("chmod(%.100s, 0%o) failed: %.100s", |